mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 20:20:26 +03:00
Merge staging-next into staging
This commit is contained in:
commit
9303bacb57
@ -602,10 +602,10 @@ been removed, in this case, it's recommended to use `pytestCheckHook`.
|
|||||||
#### Using pytestCheckHook {#using-pytestcheckhook}
|
#### Using pytestCheckHook {#using-pytestcheckhook}
|
||||||
|
|
||||||
`pytestCheckHook` is a convenient hook which will substitute the setuptools
|
`pytestCheckHook` is a convenient hook which will substitute the setuptools
|
||||||
`test` command for a checkPhase which runs `pytest`. This is also beneficial
|
`test` command for a `checkPhase` which runs `pytest`. This is also beneficial
|
||||||
when a package may need many items disabled to run the test suite.
|
when a package may need many items disabled to run the test suite.
|
||||||
|
|
||||||
Using the example above, the analagous pytestCheckHook usage would be:
|
Using the example above, the analagous `pytestCheckHook` usage would be:
|
||||||
|
|
||||||
```
|
```
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [ pytestCheckHook ];
|
||||||
@ -624,7 +624,7 @@ Using the example above, the analagous pytestCheckHook usage would be:
|
|||||||
];
|
];
|
||||||
```
|
```
|
||||||
|
|
||||||
This is expecially useful when tests need to be conditionallydisabled,
|
This is expecially useful when tests need to be conditionally disabled,
|
||||||
for example:
|
for example:
|
||||||
|
|
||||||
```
|
```
|
||||||
@ -640,31 +640,35 @@ for example:
|
|||||||
"socket"
|
"socket"
|
||||||
];
|
];
|
||||||
```
|
```
|
||||||
Trying to concatenate the related strings to disable tests in a regular checkPhase
|
|
||||||
would be much harder to read. This also enables us to comment on why specific tests
|
Trying to concatenate the related strings to disable tests in a regular
|
||||||
are disabled.
|
`checkPhase` would be much harder to read. This also enables us to comment on
|
||||||
|
why specific tests are disabled.
|
||||||
|
|
||||||
#### Using pythonImportsCheck {#using-pythonimportscheck}
|
#### Using pythonImportsCheck {#using-pythonimportscheck}
|
||||||
|
|
||||||
Although unit tests are highly prefered to validate correctness of a package, not
|
Although unit tests are highly preferred to validate correctness of a package, not
|
||||||
all packages have test suites that can be ran easily, and some have none at all.
|
all packages have test suites that can be run easily, and some have none at all.
|
||||||
To help ensure the package still works, `pythonImportsCheck` can attempt to import
|
To help ensure the package still works, `pythonImportsCheck` can attempt to import
|
||||||
the listed modules.
|
the listed modules.
|
||||||
|
|
||||||
```
|
```
|
||||||
pythonImportsCheck = [ "requests" "urllib" ];
|
pythonImportsCheck = [ "requests" "urllib" ];
|
||||||
```
|
```
|
||||||
|
|
||||||
roughly translates to:
|
roughly translates to:
|
||||||
|
|
||||||
```
|
```
|
||||||
postCheck = ''
|
postCheck = ''
|
||||||
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
|
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
|
||||||
python -c "import requests; import urllib"
|
python -c "import requests; import urllib"
|
||||||
'';
|
'';
|
||||||
```
|
```
|
||||||
However, this is done in it's own phase, and not dependent on whether `doCheck = true;`
|
|
||||||
|
However, this is done in its own phase, and not dependent on whether `doCheck = true;`.
|
||||||
|
|
||||||
This can also be useful in verifying that the package doesn't assume commonly
|
This can also be useful in verifying that the package doesn't assume commonly
|
||||||
present packages (e.g. `setuptools`)
|
present packages (e.g. `setuptools`).
|
||||||
|
|
||||||
#### Using pythonRelaxDepsHook {#using-pythonrelaxdepshook}
|
#### Using pythonRelaxDepsHook {#using-pythonrelaxdepshook}
|
||||||
|
|
||||||
@ -719,7 +723,7 @@ pkg3
|
|||||||
```
|
```
|
||||||
|
|
||||||
In general you should always use `pythonRelaxDeps`, because `pythonRemoveDeps`
|
In general you should always use `pythonRelaxDeps`, because `pythonRemoveDeps`
|
||||||
will convert build errors in runtime errors. However `pythonRemoveDeps` may
|
will convert build errors into runtime errors. However `pythonRemoveDeps` may
|
||||||
still be useful in exceptional cases, and also to remove dependencies wrongly
|
still be useful in exceptional cases, and also to remove dependencies wrongly
|
||||||
declared by upstream (for example, declaring `black` as a runtime dependency
|
declared by upstream (for example, declaring `black` as a runtime dependency
|
||||||
instead of a dev dependency).
|
instead of a dev dependency).
|
||||||
@ -738,14 +742,14 @@ creates a special link to the project code. That way, you can run updated code
|
|||||||
without having to reinstall after each and every change you make. Development
|
without having to reinstall after each and every change you make. Development
|
||||||
mode is also available. Let's see how you can use it.
|
mode is also available. Let's see how you can use it.
|
||||||
|
|
||||||
In the previous Nix expression the source was fetched from an url. We can also
|
In the previous Nix expression the source was fetched from a url. We can also
|
||||||
refer to a local source instead using `src = ./path/to/source/tree;`
|
refer to a local source instead using `src = ./path/to/source/tree;`
|
||||||
|
|
||||||
If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
|
If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
|
||||||
is a local source, and if the local source has a `setup.py`, then development
|
is a local source, and if the local source has a `setup.py`, then development
|
||||||
mode is activated.
|
mode is activated.
|
||||||
|
|
||||||
In the following example we create a simple environment that has a Python 3.9
|
In the following example, we create a simple environment that has a Python 3.9
|
||||||
version of our package in it, as well as its dependencies and other packages we
|
version of our package in it, as well as its dependencies and other packages we
|
||||||
like to have in the environment, all specified with `propagatedBuildInputs`.
|
like to have in the environment, all specified with `propagatedBuildInputs`.
|
||||||
Indeed, we can just add any package we like to have in our environment to
|
Indeed, we can just add any package we like to have in our environment to
|
||||||
@ -862,7 +866,7 @@ Each interpreter has the following attributes:
|
|||||||
|
|
||||||
### Optimizations {#optimizations}
|
### Optimizations {#optimizations}
|
||||||
|
|
||||||
The Python interpreters are by default not build with optimizations enabled, because
|
The Python interpreters are by default not built with optimizations enabled, because
|
||||||
the builds are in that case not reproducible. To enable optimizations, override the
|
the builds are in that case not reproducible. To enable optimizations, override the
|
||||||
interpreter of interest, e.g using
|
interpreter of interest, e.g using
|
||||||
|
|
||||||
@ -913,7 +917,7 @@ and the aliases
|
|||||||
#### `buildPythonPackage` function {#buildpythonpackage-function}
|
#### `buildPythonPackage` function {#buildpythonpackage-function}
|
||||||
|
|
||||||
The `buildPythonPackage` function is implemented in
|
The `buildPythonPackage` function is implemented in
|
||||||
`pkgs/development/interpreters/python/mk-python-derivation`
|
`pkgs/development/interpreters/python/mk-python-derivation.nix`
|
||||||
using setup hooks.
|
using setup hooks.
|
||||||
|
|
||||||
The following is an example:
|
The following is an example:
|
||||||
@ -954,7 +958,7 @@ The `buildPythonPackage` mainly does four things:
|
|||||||
* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to
|
* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to
|
||||||
wrap all programs in the `$out/bin/*` directory to include `$PATH`
|
wrap all programs in the `$out/bin/*` directory to include `$PATH`
|
||||||
environment variable and add dependent libraries to script's `sys.path`.
|
environment variable and add dependent libraries to script's `sys.path`.
|
||||||
* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran.
|
* In the `installCheck` phase, `${python.interpreter} setup.py test` is run.
|
||||||
|
|
||||||
By default tests are run because `doCheck = true`. Test dependencies, like
|
By default tests are run because `doCheck = true`. Test dependencies, like
|
||||||
e.g. the test runner, should be added to `checkInputs`.
|
e.g. the test runner, should be added to `checkInputs`.
|
||||||
@ -969,7 +973,7 @@ following are specific to `buildPythonPackage`:
|
|||||||
|
|
||||||
* `catchConflicts ? true`: If `true`, abort package build if a package name
|
* `catchConflicts ? true`: If `true`, abort package build if a package name
|
||||||
appears more than once in dependency tree. Default is `true`.
|
appears more than once in dependency tree. Default is `true`.
|
||||||
* `disabled` ? false: If `true`, package is not built for the particular Python
|
* `disabled ? false`: If `true`, package is not built for the particular Python
|
||||||
interpreter version.
|
interpreter version.
|
||||||
* `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs.
|
* `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs.
|
||||||
* `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment
|
* `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment
|
||||||
@ -1421,7 +1425,8 @@ in newpkgs.inkscape
|
|||||||
|
|
||||||
### `python setup.py bdist_wheel` cannot create .whl {#python-setup.py-bdist_wheel-cannot-create-.whl}
|
### `python setup.py bdist_wheel` cannot create .whl {#python-setup.py-bdist_wheel-cannot-create-.whl}
|
||||||
|
|
||||||
Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
|
Executing `python setup.py bdist_wheel` in a `nix-shell`fails with
|
||||||
|
|
||||||
```
|
```
|
||||||
ValueError: ZIP does not support timestamps before 1980
|
ValueError: ZIP does not support timestamps before 1980
|
||||||
```
|
```
|
||||||
@ -1513,7 +1518,7 @@ in pkgs.mkShell rec {
|
|||||||
# the environment.
|
# the environment.
|
||||||
pythonPackages.python
|
pythonPackages.python
|
||||||
|
|
||||||
# This execute some shell code to initialize a venv in $venvDir before
|
# This executes some shell code to initialize a venv in $venvDir before
|
||||||
# dropping into the shell
|
# dropping into the shell
|
||||||
pythonPackages.venvShellHook
|
pythonPackages.venvShellHook
|
||||||
|
|
||||||
|
@ -9286,6 +9286,12 @@
|
|||||||
githubId = 40049608;
|
githubId = 40049608;
|
||||||
name = "Andy Chun";
|
name = "Andy Chun";
|
||||||
};
|
};
|
||||||
|
nook = {
|
||||||
|
name = "Tom Nook";
|
||||||
|
email = "0xnook@protonmail.com";
|
||||||
|
github = "0xnook";
|
||||||
|
githubId = 88323754;
|
||||||
|
};
|
||||||
noreferences = {
|
noreferences = {
|
||||||
email = "norkus@norkus.net";
|
email = "norkus@norkus.net";
|
||||||
github = "jozuas";
|
github = "jozuas";
|
||||||
@ -11498,6 +11504,13 @@
|
|||||||
githubId = 543055;
|
githubId = 543055;
|
||||||
name = "Shadaj Laddad";
|
name = "Shadaj Laddad";
|
||||||
};
|
};
|
||||||
|
shadowrz = {
|
||||||
|
email = "shadowrz+nixpkgs@disroot.org";
|
||||||
|
matrix = "@ShadowRZ:matrixim.cc";
|
||||||
|
github = "ShadowRZ";
|
||||||
|
githubId = 23130178;
|
||||||
|
name = "夜坂雅";
|
||||||
|
};
|
||||||
shahrukh330 = {
|
shahrukh330 = {
|
||||||
email = "shahrukh330@gmail.com";
|
email = "shahrukh330@gmail.com";
|
||||||
github = "shahrukh330";
|
github = "shahrukh330";
|
||||||
|
@ -362,7 +362,6 @@ with foo_running:
|
|||||||
... # Put `foo` through its paces
|
... # Put `foo` through its paces
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
`polling_condition` takes the following (optional) arguments:
|
`polling_condition` takes the following (optional) arguments:
|
||||||
|
|
||||||
`seconds_interval`
|
`seconds_interval`
|
||||||
@ -407,6 +406,9 @@ import ./make-test-python.nix
|
|||||||
|
|
||||||
nodes = { };
|
nodes = { };
|
||||||
|
|
||||||
|
# Type checking on extra packages doesn't work yet
|
||||||
|
skipTypeCheck = true;
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
import numpy as np
|
import numpy as np
|
||||||
assert str(np.zeros(4) == "array([0., 0., 0., 0.])")
|
assert str(np.zeros(4) == "array([0., 0., 0., 0.])")
|
||||||
|
@ -680,6 +680,9 @@ import ./make-test-python.nix
|
|||||||
|
|
||||||
nodes = { };
|
nodes = { };
|
||||||
|
|
||||||
|
# Type checking on extra packages doesn't work yet
|
||||||
|
skipTypeCheck = true;
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
import numpy as np
|
import numpy as np
|
||||||
assert str(np.zeros(4) == "array([0., 0., 0., 0.])")
|
assert str(np.zeros(4) == "array([0., 0., 0., 0.])")
|
||||||
|
@ -11,7 +11,7 @@ in
|
|||||||
options.system = {
|
options.system = {
|
||||||
|
|
||||||
nixos.label = mkOption {
|
nixos.label = mkOption {
|
||||||
type = types.str;
|
type = types.strMatching "[a-zA-Z0-9:_\\.-]*";
|
||||||
description = ''
|
description = ''
|
||||||
NixOS version name to be used in the names of generated
|
NixOS version name to be used in the names of generated
|
||||||
outputs and boot labels.
|
outputs and boot labels.
|
||||||
@ -19,6 +19,9 @@ in
|
|||||||
If you ever wanted to influence the labels in your GRUB menu,
|
If you ever wanted to influence the labels in your GRUB menu,
|
||||||
this is the option for you.
|
this is the option for you.
|
||||||
|
|
||||||
|
It can only contain letters, numbers and the following symbols:
|
||||||
|
<literal>:</literal>, <literal>_</literal>, <literal>.</literal> and <literal>-</literal>.
|
||||||
|
|
||||||
The default is <option>system.nixos.tags</option> separated by
|
The default is <option>system.nixos.tags</option> separated by
|
||||||
"-" + "-" + <envar>NIXOS_LABEL_VERSION</envar> environment
|
"-" + "-" + <envar>NIXOS_LABEL_VERSION</envar> environment
|
||||||
variable (defaults to the value of
|
variable (defaults to the value of
|
||||||
|
@ -23,7 +23,11 @@ let
|
|||||||
infraContainer = pkgs.dockerTools.buildImage {
|
infraContainer = pkgs.dockerTools.buildImage {
|
||||||
name = "pause";
|
name = "pause";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
contents = top.package.pause;
|
copyToRoot = pkgs.buildEnv {
|
||||||
|
name = "image-root";
|
||||||
|
pathsToLink = [ "/bin" ];
|
||||||
|
paths = [ top.package.pause ];
|
||||||
|
};
|
||||||
config.Cmd = ["/bin/pause"];
|
config.Cmd = ["/bin/pause"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -33,7 +33,11 @@ let
|
|||||||
redisImage = pkgs.dockerTools.buildImage {
|
redisImage = pkgs.dockerTools.buildImage {
|
||||||
name = "redis";
|
name = "redis";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
contents = [ pkgs.redis pkgs.bind.host ];
|
copyToRoot = pkgs.buildEnv {
|
||||||
|
name = "image-root";
|
||||||
|
pathsToLink = [ "/bin" ];
|
||||||
|
paths = [ pkgs.redis pkgs.bind.host ];
|
||||||
|
};
|
||||||
config.Entrypoint = ["/bin/redis-server"];
|
config.Entrypoint = ["/bin/redis-server"];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -54,7 +58,11 @@ let
|
|||||||
probeImage = pkgs.dockerTools.buildImage {
|
probeImage = pkgs.dockerTools.buildImage {
|
||||||
name = "probe";
|
name = "probe";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
contents = [ pkgs.bind.host pkgs.busybox ];
|
copyToRoot = pkgs.buildEnv {
|
||||||
|
name = "image-root";
|
||||||
|
pathsToLink = [ "/bin" ];
|
||||||
|
paths = [ pkgs.bind.host pkgs.busybox ];
|
||||||
|
};
|
||||||
config.Entrypoint = ["/bin/tail"];
|
config.Entrypoint = ["/bin/tail"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -84,7 +84,11 @@ let
|
|||||||
kubectlImage = pkgs.dockerTools.buildImage {
|
kubectlImage = pkgs.dockerTools.buildImage {
|
||||||
name = "kubectl";
|
name = "kubectl";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
contents = [ copyKubectl pkgs.busybox kubectlPod2 ];
|
copyToRoot = pkgs.buildEnv {
|
||||||
|
name = "image-root";
|
||||||
|
pathsToLink = [ "/bin" ];
|
||||||
|
paths = [ copyKubectl pkgs.busybox kubectlPod2 ];
|
||||||
|
};
|
||||||
config.Entrypoint = ["/bin/sh"];
|
config.Entrypoint = ["/bin/sh"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
35
pkgs/applications/blockchains/framesh/default.nix
Normal file
35
pkgs/applications/blockchains/framesh/default.nix
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{ lib, fetchurl, appimageTools }:
|
||||||
|
|
||||||
|
let
|
||||||
|
pname = "framesh";
|
||||||
|
version = "0.5.0-beta.20";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
|
||||||
|
sha256 = "sha256-4PU3f5e9NJYnP49nVtCjbGXxWJDCJIArzuaLsWB3Cx0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
appimageContents = appimageTools.extractType2 {
|
||||||
|
inherit pname version src;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
appimageTools.wrapType2 {
|
||||||
|
inherit pname version src;
|
||||||
|
|
||||||
|
extraInstallCommands = ''
|
||||||
|
ln -s $out/bin/${pname}-${version} $out/bin/${pname}
|
||||||
|
install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop
|
||||||
|
install -m 444 -D ${appimageContents}/frame.png \
|
||||||
|
$out/share/icons/hicolor/512x512/apps/frame.png
|
||||||
|
substituteInPlace $out/share/applications/frame.desktop \
|
||||||
|
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Native web3 interface that lets you sign data, securely manage accounts and transparently interact with dapps via web3 protocols like Ethereum and IPFS";
|
||||||
|
homepage = "https://frame.sh/";
|
||||||
|
downloadPage = "https://github.com/floating/frame/releases";
|
||||||
|
license = lib.licenses.gpl3Only;
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
maintainers = with lib.maintainers; [ nook ];
|
||||||
|
};
|
||||||
|
}
|
@ -17,5 +17,10 @@ stdenv.mkDerivation {
|
|||||||
cp -v vc4emul/vc4emul $out/bin/vc4emul
|
cp -v vc4emul/vc4emul $out/bin/vc4emul
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
|
];
|
||||||
|
|
||||||
meta.license = lib.licenses.mit;
|
meta.license = lib.licenses.mit;
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
{ lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }:
|
{ lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }:
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "OSCAR";
|
pname = "OSCAR";
|
||||||
version = "1.3.1";
|
version = "1.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "pholy";
|
owner = "pholy";
|
||||||
repo = "OSCAR-code";
|
repo = "OSCAR-code";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-/70NoyiQ33RFdSTBAyi5c/JPZ2AV1/iRvkAZ6VjpUXw=";
|
sha256 = "sha256-bgETkpyL0yhCD1FfTVN0s9RNOPkDp88W/1Gdxvu+Ons=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ qtbase qttools qtserialport libGLU ];
|
buildInputs = [ qtbase qttools qtserialport libGLU ];
|
||||||
|
@ -29,6 +29,8 @@ mkDerivation rec {
|
|||||||
"-DGTEST_ROOT=${gtest.src}/googletest"
|
"-DGTEST_ROOT=${gtest.src}/googletest"
|
||||||
"-DQT_TRANSLATIONS_DIR=${qttranslations}/translations"
|
"-DQT_TRANSLATIONS_DIR=${qttranslations}/translations"
|
||||||
"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
|
"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
|
||||||
|
# file RPATH_CHANGE could not write new RPATH
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -31,6 +31,9 @@ mkDerivation rec {
|
|||||||
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
|
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
|
||||||
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
|
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
|
||||||
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
|
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
|
||||||
|
|
||||||
|
# file RPATH_CHANGE could not write new RPATH
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "terranix";
|
pname = "terranix";
|
||||||
version = "2.5.3";
|
version = "2.5.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mrVanDalo";
|
owner = "mrVanDalo";
|
||||||
repo = "terranix";
|
repo = "terranix";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Jhq0pkyF1KWJ6HgeWLoRfIxo7QHvOwwXzsIxZQgQtK4=";
|
sha256 = "sha256-zctvB0zpPY2C1HkMyEK6NFNuPVNGcU9b8gv9HafBd2A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"name": "element-desktop",
|
"name": "element-desktop",
|
||||||
"productName": "Element",
|
"productName": "Element",
|
||||||
"main": "lib/electron-main.js",
|
"main": "lib/electron-main.js",
|
||||||
"version": "1.10.15",
|
"version": "1.11.0",
|
||||||
"description": "A feature-rich client for Matrix.org",
|
"description": "A feature-rich client for Matrix.org",
|
||||||
"author": "Element",
|
"author": "Element",
|
||||||
"repository": {
|
"repository": {
|
||||||
@ -61,7 +61,8 @@
|
|||||||
"app-builder-lib": "^22.14.10",
|
"app-builder-lib": "^22.14.10",
|
||||||
"asar": "^2.0.1",
|
"asar": "^2.0.1",
|
||||||
"chokidar": "^3.5.2",
|
"chokidar": "^3.5.2",
|
||||||
"electron": "^17",
|
"detect-libc": "^1.0.3",
|
||||||
|
"electron": "^19",
|
||||||
"electron-builder": "22.11.4",
|
"electron-builder": "22.11.4",
|
||||||
"electron-builder-squirrel-windows": "22.11.4",
|
"electron-builder-squirrel-windows": "22.11.4",
|
||||||
"electron-devtools-installer": "^3.1.1",
|
"electron-devtools-installer": "^3.1.1",
|
||||||
@ -73,7 +74,7 @@
|
|||||||
"find-npm-prefix": "^1.0.2",
|
"find-npm-prefix": "^1.0.2",
|
||||||
"fs-extra": "^8.1.0",
|
"fs-extra": "^8.1.0",
|
||||||
"glob": "^7.1.6",
|
"glob": "^7.1.6",
|
||||||
"matrix-web-i18n": "^1.2.0",
|
"matrix-web-i18n": "^1.3.0",
|
||||||
"mkdirp": "^1.0.3",
|
"mkdirp": "^1.0.3",
|
||||||
"needle": "^2.5.0",
|
"needle": "^2.5.0",
|
||||||
"node-pre-gyp": "^0.15.0",
|
"node-pre-gyp": "^0.15.0",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "element-web",
|
"name": "element-web",
|
||||||
"version": "1.10.15",
|
"version": "1.11.0",
|
||||||
"description": "A feature-rich client for Matrix.org",
|
"description": "A feature-rich client for Matrix.org",
|
||||||
"author": "New Vector Ltd.",
|
"author": "New Vector Ltd.",
|
||||||
"repository": {
|
"repository": {
|
||||||
@ -56,10 +56,10 @@
|
|||||||
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
|
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
|
||||||
"browser-request": "^0.3.3",
|
"browser-request": "^0.3.3",
|
||||||
"gfm.css": "^1.1.2",
|
"gfm.css": "^1.1.2",
|
||||||
"jsrsasign": "^10.2.0",
|
"jsrsasign": "^10.5.25",
|
||||||
"katex": "^0.12.0",
|
"katex": "^0.12.0",
|
||||||
"matrix-js-sdk": "18.1.0",
|
"matrix-js-sdk": "19.0.0",
|
||||||
"matrix-react-sdk": "3.47.0",
|
"matrix-react-sdk": "3.48.0",
|
||||||
"matrix-widget-api": "^0.1.0-beta.18",
|
"matrix-widget-api": "^0.1.0-beta.18",
|
||||||
"prop-types": "^15.7.2",
|
"prop-types": "^15.7.2",
|
||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
@ -125,7 +125,7 @@
|
|||||||
"loader-utils": "^1.4.0",
|
"loader-utils": "^1.4.0",
|
||||||
"matrix-mock-request": "^2.0.0",
|
"matrix-mock-request": "^2.0.0",
|
||||||
"matrix-react-test-utils": "^0.2.3",
|
"matrix-react-test-utils": "^0.2.3",
|
||||||
"matrix-web-i18n": "^1.2.0",
|
"matrix-web-i18n": "^1.3.0",
|
||||||
"mini-css-extract-plugin": "^0.12.0",
|
"mini-css-extract-plugin": "^0.12.0",
|
||||||
"minimist": "^1.2.6",
|
"minimist": "^1.2.6",
|
||||||
"mkdirp": "^1.0.4",
|
"mkdirp": "^1.0.4",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": "1.10.15",
|
"version": "1.11.0",
|
||||||
"desktopSrcHash": "2XSTE6NbhWYAH3tr1Kd16vEAGn3ApZ0a9PdpoHJn3uE=",
|
"desktopSrcHash": "WYXPsiR3hKj+cPvs5bLzZ301vLISp3ANLf/GgBBMYqM=",
|
||||||
"desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n",
|
"desktopYarnHash": "0v60ak06g87i3q5rqgxy3v3whk3njj0v1ml9rfdab1mbzrj6209c",
|
||||||
"webSrcHash": "lX31OWJ6/S+PbOKvEqYALtOIoaJjwg4ng/wHOfXCSqg=",
|
"webSrcHash": "L6ONDjGy8Uuo7E4O5ajIYdDLYL59JkuUk9hAAlTID1k=",
|
||||||
"webYarnHash": "0j6xv64w5vszhlfqz37asqxsql0m89gscrl270dlxzycd4ybzghz"
|
"webYarnHash": "15qhw2z05ylxvidaaifpxxdpd68s7qbwpgx9y95x6v82fcr7xhrz"
|
||||||
}
|
}
|
||||||
|
@ -1,74 +1,144 @@
|
|||||||
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas
|
{ lib
|
||||||
, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }:
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, makeWrapper
|
||||||
|
, makeDesktopItem
|
||||||
|
, copyDesktopItems
|
||||||
|
, unzip
|
||||||
|
, xdg-utils
|
||||||
|
, jdk
|
||||||
|
, gradle
|
||||||
|
, perl
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "5.5";
|
version = "5.6";
|
||||||
pname = "jabref";
|
pname = "jabref";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz";
|
owner = "JabRef";
|
||||||
sha256 = "sha256-9MHNehyAmu7CiBp1rgb4zTkSqmjXm2tcmiGKFBFapKI=";
|
repo = "jabref";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-w3F1td7KmdSor/2vKar3w17bChe1yH7JMobOaCjZqd4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preferLocalBuild = true;
|
desktopItems = [
|
||||||
|
(makeDesktopItem {
|
||||||
|
comment = meta.description;
|
||||||
|
name = "jabref";
|
||||||
|
desktopName = "JabRef";
|
||||||
|
genericName = "Bibliography manager";
|
||||||
|
categories = [ "Office" ];
|
||||||
|
icon = "jabref";
|
||||||
|
exec = "jabref";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
deps = stdenv.mkDerivation {
|
||||||
comment = meta.description;
|
pname = "${pname}-deps";
|
||||||
name = "jabref";
|
inherit src version;
|
||||||
desktopName = "JabRef";
|
|
||||||
genericName = "Bibliography manager";
|
postPatch = ''
|
||||||
categories = [ "Office" ];
|
sed -i -e '/testImplementation/d' -e '/testRuntimeOnly/d' build.gradle
|
||||||
icon = "jabref";
|
echo 'dependencyLocking { lockAllConfigurations() }' >> build.gradle
|
||||||
exec = "jabref";
|
cp ${./gradle.lockfile} ./
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ gradle perl ];
|
||||||
|
buildPhase = ''
|
||||||
|
export GRADLE_USER_HOME=$(mktemp -d)
|
||||||
|
gradle --no-daemon downloadDependencies
|
||||||
|
'';
|
||||||
|
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
||||||
|
installPhase = ''
|
||||||
|
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||||
|
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
|
||||||
|
| sh
|
||||||
|
'';
|
||||||
|
# Don't move info to share/
|
||||||
|
forceShare = [ "dummy" ];
|
||||||
|
outputHashMode = "recursive";
|
||||||
|
outputHash = {
|
||||||
|
x86_64-linux = "sha256-ySGXZM9LCJUjGCrKMc+5I6duEbmSsp3tU3t/o5nM+5M=";
|
||||||
|
aarch64-linux = "sha256-mfWyGGBqjRQ8q9ddR57O2rwtby2T1H6Ra2m0JGVZ1Zs=";
|
||||||
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
preBuild = ''
|
||||||
buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs;
|
# Include CSL styles and locales in our build
|
||||||
|
cp -r buildres/csl/* src/main/resources/
|
||||||
|
|
||||||
systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsa-lib cairo freetype pango gdk-pixbuf glib ];
|
# Use the local packages from -deps
|
||||||
systemLibPaths = lib.makeLibraryPath systemLibs;
|
sed -i -e '/repositories {/a maven { url uri("${deps}") }' \
|
||||||
|
build.gradle \
|
||||||
|
buildSrc/build.gradle \
|
||||||
|
settings.gradle
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
jdk
|
||||||
|
gradle
|
||||||
|
makeWrapper
|
||||||
|
copyDesktopItems
|
||||||
|
unzip
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
export GRADLE_USER_HOME=$(mktemp -d)
|
||||||
|
gradle \
|
||||||
|
--offline \
|
||||||
|
--no-daemon \
|
||||||
|
-PprojVersion="${version}" \
|
||||||
|
-PprojVersionInfo="${version} NixOS" \
|
||||||
|
assemble
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/java $out/share/icons
|
runHook preInstall
|
||||||
|
|
||||||
cp -r lib $out/lib
|
install -dm755 $out/share/java/jabref
|
||||||
|
install -Dm644 LICENSE.md $out/share/licenses/jabref/LICENSE.md
|
||||||
|
install -Dm644 src/main/resources/icons/jabref.svg $out/share/pixmaps/jabref.svg
|
||||||
|
|
||||||
for f in $out/lib/runtime/bin/j*; do
|
# script to support browser extensions
|
||||||
patchelf \
|
install -Dm755 buildres/linux/jabrefHost.py $out/lib/jabrefHost.py
|
||||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
# This can be removed in the next version
|
||||||
--set-rpath "${ lib.makeLibraryPath [ zlib ]}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f
|
sed -i -e "/importBibtex/s/{}/'{}'/" $out/lib/jabrefHost.py
|
||||||
done
|
install -Dm644 buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json
|
||||||
|
sed -i -e "s|/opt/jabref|$out|" $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json
|
||||||
|
|
||||||
for f in $out/lib/runtime/lib/*.so; do
|
# Resources in the jar can't be found, workaround copied from AUR
|
||||||
patchelf \
|
cp -r build/resources $out/share/java/jabref
|
||||||
--set-rpath "${systemLibPaths}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f
|
|
||||||
done
|
|
||||||
|
|
||||||
# patching the libs in the JImage runtime image is quite impossible as there is no documented way
|
# workaround for https://github.com/NixOS/nixpkgs/issues/162064
|
||||||
# of rebuilding the image after it has been extracted
|
tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1
|
||||||
# the image format itself is "intendedly not documented" - maybe one of the reasons the
|
unzip $out/lib/javafx-web-18-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/
|
||||||
# devolpers constantly broke "jimage recreate" and dropped it in OpenJDK 9 Build 116 Early Access
|
|
||||||
# so, for now just copy the image and provide our lib paths through the wrapper
|
|
||||||
|
|
||||||
makeWrapper $out/lib/runtime/bin/java $out/bin/jabref \
|
wrapProgram $out/bin/JabRef \
|
||||||
--add-flags '-Djava.library.path=${systemLibPaths}' --add-flags "-p $out/lib/app -m org.jabref/org.jabref.JabRefLauncher" \
|
--prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||||
--prefix LD_LIBRARY_PATH : '${systemLibPaths}'
|
--set JAVA_HOME "${jdk}" \
|
||||||
|
--set JAVA_OPTS "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main"
|
||||||
|
|
||||||
cp -r ${desktopItem}/share/applications $out/share/
|
# lowercase alias (for convenience and required for browser extensions)
|
||||||
|
ln -sf $out/bin/JabRef $out/bin/jabref
|
||||||
|
|
||||||
# we still need to unpack the runtime image to get the icon
|
runHook postInstall
|
||||||
mkdir unpacked
|
|
||||||
$out/lib/runtime/bin/jimage extract --dir=./unpacked lib/runtime/lib/modules
|
|
||||||
cp unpacked/org.jabref/icons/jabref.svg $out/share/icons/jabref.svg
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
|
||||||
description = "Open source bibliography reference manager";
|
description = "Open source bibliography reference manager";
|
||||||
homepage = "https://www.jabref.org";
|
homepage = "https://www.jabref.org";
|
||||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with sourceTypes; [
|
||||||
|
fromSource
|
||||||
|
binaryBytecode # source bundles dependencies as jars
|
||||||
|
binaryNativeCode # source bundles dependencies as jars
|
||||||
|
];
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
platforms = platforms.unix;
|
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
maintainers = [ maintainers.gebner ];
|
maintainers = with maintainers; [ gebner linsui ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
180
pkgs/applications/office/jabref/gradle.lockfile
Normal file
180
pkgs/applications/office/jabref/gradle.lockfile
Normal file
@ -0,0 +1,180 @@
|
|||||||
|
# This is a Gradle generated file for dependency locking.
|
||||||
|
# Manual edits can break the build and are not advised.
|
||||||
|
# This file is expected to be part of source control.
|
||||||
|
classworlds:classworlds:1.1-alpha-2=modernizer
|
||||||
|
com.fasterxml.jackson.core:jackson-annotations:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.fasterxml.jackson.core:jackson-core:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.fasterxml.jackson.core:jackson-databind:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.fasterxml.jackson:jackson-bom:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.github.tomtung:latex2unicode_2.12:0.2.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.google.code.findbugs:jsr305:3.0.2=checkstyle
|
||||||
|
com.google.code.gson:gson:2.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.google.errorprone:error_prone_annotations:2.11.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.google.guava:failureaccess:1.0.1=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.google.guava:guava:31.1-jre=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.googlecode.javaewah:JavaEWAH:1.1.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.h2database:h2-mvstore:2.1.212=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.ibm.icu:icu4j-charset:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.ibm.icu:icu4j:69.1=antlr4
|
||||||
|
com.ibm.icu:icu4j:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.jfoenix:jfoenix:9.0.10=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.konghq:unirest-java:3.13.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.microsoft.azure:applicationinsights-core:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.oracle.ojdbc:ojdbc10:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.oracle.ojdbc:ons:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.oracle.ojdbc:osdt_cert:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.oracle.ojdbc:osdt_core:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.oracle.ojdbc:simplefan:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.oracle.ojdbc:ucp:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.puppycrawl.tools:checkstyle:10.1=checkstyle
|
||||||
|
com.sun.activation:jakarta.activation:2.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
|
||||||
|
com.sun.istack:istack-commons-runtime:4.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
|
||||||
|
com.sun.istack:istack-commons-tools:4.0.1=xjc
|
||||||
|
com.sun.xml.bind.external:relaxng-datatype:3.0.2=xjc
|
||||||
|
com.sun.xml.bind.external:rngom:3.0.2=xjc
|
||||||
|
com.sun.xml.dtd-parser:dtd-parser:1.4.5=xjc
|
||||||
|
com.tobiasdiez:easybind:2.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-ast:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-builder:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-collection:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-data:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-dependency:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-format:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-html:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-misc:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-options:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-sequence:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util-visitor:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark-util:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
com.vladsch.flexmark:flexmark:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
commons-beanutils:commons-beanutils:1.9.4=checkstyle
|
||||||
|
commons-cli:commons-cli:1.5.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
commons-codec:commons-codec:1.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
commons-collections:commons-collections:3.2.2=checkstyle
|
||||||
|
commons-io:commons-io:2.11.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
commons-logging:commons-logging:1.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
de.saxsys:mvvmfx:1.8.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
de.undercouch:citeproc-java:3.0.0-alpha.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
eu.lestard:doc-annotations:0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
info.debatty:java-string-similarity:2.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
info.picocli:picocli:4.6.3=checkstyle
|
||||||
|
io.github.java-diff-utils:java-diff-utils:4.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
jakarta.annotation:jakarta.annotation-api:1.3.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
|
||||||
|
junit:junit:3.8.1=modernizer
|
||||||
|
net.harawata:appdirs:1.2.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
net.java.dev.jna:jna-platform:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
net.java.dev.jna:jna:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
net.jcip:jcip-annotations:1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
net.jodah:typetools:0.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
net.sf.jopt-simple:jopt-simple:4.6=jmh,jmhCompileClasspath,jmhRuntimeClasspath
|
||||||
|
net.sf.saxon:Saxon-HE:10.6=checkstyle
|
||||||
|
org.abego.treelayout:org.abego.treelayout.core:1.0.3=antlr4
|
||||||
|
org.antlr:ST4:4.3.1=antlr3,antlr4
|
||||||
|
org.antlr:antlr-runtime:3.5.2=antlr4,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.antlr:antlr-runtime:3.5.3=antlr3
|
||||||
|
org.antlr:antlr4-runtime:4.9.3=antlr4,checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.antlr:antlr4:4.9.3=antlr4
|
||||||
|
org.antlr:antlr:3.5.3=antlr3
|
||||||
|
org.apache.commons:commons-csv:1.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.commons:commons-lang3:3.12.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.commons:commons-math3:3.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath
|
||||||
|
org.apache.commons:commons-text:1.9=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
|
||||||
|
org.apache.httpcomponents:httpasyncclient:4.1.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.httpcomponents:httpclient:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.httpcomponents:httpcore-nio:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.httpcomponents:httpcore:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.httpcomponents:httpmime:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.lucene:lucene-analysis-common:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.lucene:lucene-core:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.lucene:lucene-highlighter:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.lucene:lucene-memory:9.1.0=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
|
||||||
|
org.apache.lucene:lucene-queries:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.lucene:lucene-queryparser:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.lucene:lucene-sandbox:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.maven.wagon:wagon-provider-api:1.0-beta-2=modernizer
|
||||||
|
org.apache.maven:maven-artifact-manager:2.0.9=modernizer
|
||||||
|
org.apache.maven:maven-artifact:2.0.9=modernizer
|
||||||
|
org.apache.maven:maven-model:2.0.9=modernizer
|
||||||
|
org.apache.maven:maven-plugin-api:2.0=modernizer
|
||||||
|
org.apache.maven:maven-plugin-registry:2.0.9=modernizer
|
||||||
|
org.apache.maven:maven-profile:2.0.9=modernizer
|
||||||
|
org.apache.maven:maven-project:2.0.9=modernizer
|
||||||
|
org.apache.maven:maven-repository-metadata:2.0.9=modernizer
|
||||||
|
org.apache.maven:maven-settings:2.0.9=modernizer
|
||||||
|
org.apache.pdfbox:fontbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.pdfbox:pdfbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.pdfbox:xmpbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.apache.tika:tika-core:2.3.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.bouncycastle:bcprov-jdk15on:1.70=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.checkerframework:checker-qual:3.12.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.codehaus.mojo:animal-sniffer-annotations:1.18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=modernizer
|
||||||
|
org.controlsfx:controlsfx:11.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.fxmisc.flowless:flowless:0.6.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.fxmisc.richtext:richtextfx:0.10.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.fxmisc.undo:undofx:2.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.fxmisc.wellbehaved:wellbehavedfx:0.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.gaul:modernizer-maven-annotations:2.3.0=modernizer
|
||||||
|
org.gaul:modernizer-maven-plugin:2.3.0=modernizer
|
||||||
|
org.glassfish.hk2.external:jakarta.inject:2.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.glassfish.jaxb:codemodel:3.0.2=xjc
|
||||||
|
org.glassfish.jaxb:jaxb-core:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
|
||||||
|
org.glassfish.jaxb:jaxb-runtime:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
|
||||||
|
org.glassfish.jaxb:jaxb-xjc:3.0.2=xjc
|
||||||
|
org.glassfish.jaxb:txw2:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
|
||||||
|
org.glassfish.jaxb:xsom:3.0.2=xjc
|
||||||
|
org.glassfish:javax.json:1.0.4=antlr4
|
||||||
|
org.jacoco:org.jacoco.agent:0.8.7=jacocoAgent,jacocoAnt
|
||||||
|
org.jacoco:org.jacoco.ant:0.8.7=jacocoAnt
|
||||||
|
org.jacoco:org.jacoco.core:0.8.7=jacocoAnt
|
||||||
|
org.jacoco:org.jacoco.report:0.8.7=jacocoAnt
|
||||||
|
org.javassist:javassist:3.28.0-GA=checkstyle
|
||||||
|
org.jbibtex:jbibtex:1.0.19=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.jetbrains:annotations:15.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.jsoup:jsoup:1.14.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.kordamp.ikonli:ikonli-core:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.kordamp.ikonli:ikonli-javafx:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.libreoffice:libreoffice:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.libreoffice:unoloader:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.mariadb.jdbc:mariadb-java-client:2.7.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.openjdk.jmh:jmh-core:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
|
||||||
|
org.openjdk.jmh:jmh-generator-asm:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
|
||||||
|
org.openjdk.jmh:jmh-generator-bytecode:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
|
||||||
|
org.openjdk.jmh:jmh-generator-reflection:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
|
||||||
|
org.openjfx:javafx-base:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.openjfx:javafx-controls:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.openjfx:javafx-fxml:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.openjfx:javafx-graphics:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.openjfx:javafx-media:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.openjfx:javafx-swing:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.openjfx:javafx-web:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.ow2.asm:asm-analysis:9.1=jacocoAnt
|
||||||
|
org.ow2.asm:asm-analysis:9.2=modernizer
|
||||||
|
org.ow2.asm:asm-commons:9.1=jacocoAnt
|
||||||
|
org.ow2.asm:asm-commons:9.2=modernizer
|
||||||
|
org.ow2.asm:asm-tree:9.1=jacocoAnt
|
||||||
|
org.ow2.asm:asm-tree:9.2=modernizer
|
||||||
|
org.ow2.asm:asm:5.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath
|
||||||
|
org.ow2.asm:asm:9.1=jacocoAnt
|
||||||
|
org.ow2.asm:asm:9.2=modernizer
|
||||||
|
org.postgresql:postgresql:42.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.reactfx:reactfx:2.0-M5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.reflections:reflections:0.10.2=checkstyle
|
||||||
|
org.scala-lang:scala-library:2.12.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.slf4j:slf4j-api:2.0.0-alpha7=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.tinylog:slf4j-tinylog:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.tinylog:tinylog-api:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.tinylog:tinylog-impl:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
org.yaml:snakeyaml:1.30=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
empty=annotationProcessor,jmhAnnotationProcessor,testAnnotationProcessor
|
@ -47,6 +47,9 @@ let
|
|||||||
"-DBUILD_STATIC=OFF"
|
"-DBUILD_STATIC=OFF"
|
||||||
"-DJAVA=${boolToCmake includeJava}"
|
"-DJAVA=${boolToCmake includeJava}"
|
||||||
"-DGPL=${boolToCmake includeGplCode}"
|
"-DGPL=${boolToCmake includeGplCode}"
|
||||||
|
|
||||||
|
# file RPATH_CHANGE could not write new RPATH
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = optionalString includeJava ''
|
postInstall = optionalString includeJava ''
|
||||||
|
@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
|
|||||||
"-Denable_compile_warnings=off"
|
"-Denable_compile_warnings=off"
|
||||||
"-Denable_compile_optimizations=${optionOnOff optimize}"
|
"-Denable_compile_optimizations=${optionOnOff optimize}"
|
||||||
"-Denable_lto=${optionOnOff optimize}"
|
"-Denable_lto=${optionOnOff optimize}"
|
||||||
|
|
||||||
|
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
];
|
];
|
||||||
makeFlags = optional debug "VERBOSE=1";
|
makeFlags = optional debug "VERBOSE=1";
|
||||||
|
|
||||||
|
@ -588,7 +588,7 @@ rec {
|
|||||||
chown 1000 ./home/jane
|
chown 1000 ./home/jane
|
||||||
ln -s ${pkgs.hello.overrideAttrs (o: {
|
ln -s ${pkgs.hello.overrideAttrs (o: {
|
||||||
# A unique `hello` to make sure that it isn't included via another mechanism by accident.
|
# A unique `hello` to make sure that it isn't included via another mechanism by accident.
|
||||||
configureFlags = o.configureFlags or "" + " --program-prefix=layeredImageWithFakeRootCommands-";
|
configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
})} ./hello
|
})} ./hello
|
||||||
'';
|
'';
|
||||||
|
89
pkgs/development/interpreters/renpy/default.nix
Normal file
89
pkgs/development/interpreters/renpy/default.nix
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
{ lib, stdenv, fetchFromGitHub, python3, pkg-config, SDL2
|
||||||
|
, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib
|
||||||
|
, makeWrapper
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "renpy";
|
||||||
|
|
||||||
|
# https://renpy.org/doc/html/changelog.html#versioning
|
||||||
|
# base_version is of the form major.minor.patch
|
||||||
|
# vc_version is of the form YYMMDDCC
|
||||||
|
# version corresponds to the tag on GitHub
|
||||||
|
base_version = "8.0.0";
|
||||||
|
vc_version = "22062402";
|
||||||
|
version = "${base_version}.${vc_version}";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "renpy";
|
||||||
|
repo = "renpy";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-37Hbs0i5eXMjVaETX7ImJCak0y8XtEHUaRFceA9J39A=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
makeWrapper
|
||||||
|
python3.pkgs.cython
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib
|
||||||
|
] ++ (with python3.pkgs; [
|
||||||
|
python pygame_sdl2 tkinter future six pefile requests
|
||||||
|
]);
|
||||||
|
|
||||||
|
RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
|
||||||
|
SDL2 SDL2.dev libpng ffmpeg.out freetype glew.dev libGLU libGL fribidi zlib
|
||||||
|
]);
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./renpy-system-fribidi.diff
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace module/setup.py \
|
||||||
|
--replace "@fribidi@" "${fribidi}"
|
||||||
|
|
||||||
|
cp tutorial/game/tutorial_director.rpy{m,}
|
||||||
|
|
||||||
|
cat > renpy/vc_version.py << EOF
|
||||||
|
vc_version = ${vc_version}
|
||||||
|
official = False
|
||||||
|
nightly = False
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildPhase = with python3.pkgs; ''
|
||||||
|
runHook preBuild
|
||||||
|
${python.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = with python3.pkgs; ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
${python.interpreter} module/setup.py install --prefix=$out
|
||||||
|
mkdir -p $out/share/renpy
|
||||||
|
cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy
|
||||||
|
|
||||||
|
makeWrapper ${python.interpreter} $out/bin/renpy \
|
||||||
|
--set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \
|
||||||
|
--add-flags "-O $out/share/renpy/renpy.py"
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame_sdl2}/include/${python.libPrefix}";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Visual Novel Engine";
|
||||||
|
homepage = "https://renpy.org/";
|
||||||
|
changelog = "https://renpy.org/doc/html/changelog.html";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ shadowrz ];
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,51 @@
|
|||||||
|
diff --git a/module/renpybidicore.c b/module/renpybidicore.c
|
||||||
|
index 849430d..d883a52 100644
|
||||||
|
--- a/module/renpybidicore.c
|
||||||
|
+++ b/module/renpybidicore.c
|
||||||
|
@@ -1,10 +1,6 @@
|
||||||
|
#include <Python.h>
|
||||||
|
|
||||||
|
-#ifdef RENPY_BUILD
|
||||||
|
#include <fribidi.h>
|
||||||
|
-#else
|
||||||
|
-#include <fribidi-src/lib/fribidi.h>
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
diff --git a/module/setup.py b/module/setup.py
|
||||||
|
index bd16816..f6b8794 100755
|
||||||
|
--- a/module/setup.py
|
||||||
|
+++ b/module/setup.py
|
||||||
|
@@ -118,29 +118,17 @@ cython(
|
||||||
|
sdl + [ png, 'z', 'm' ])
|
||||||
|
|
||||||
|
FRIBIDI_SOURCES = """
|
||||||
|
-fribidi-src/lib/fribidi.c
|
||||||
|
-fribidi-src/lib/fribidi-arabic.c
|
||||||
|
-fribidi-src/lib/fribidi-bidi.c
|
||||||
|
-fribidi-src/lib/fribidi-bidi-types.c
|
||||||
|
-fribidi-src/lib/fribidi-deprecated.c
|
||||||
|
-fribidi-src/lib/fribidi-joining.c
|
||||||
|
-fribidi-src/lib/fribidi-joining-types.c
|
||||||
|
-fribidi-src/lib/fribidi-mem.c
|
||||||
|
-fribidi-src/lib/fribidi-mirroring.c
|
||||||
|
-fribidi-src/lib/fribidi-run.c
|
||||||
|
-fribidi-src/lib/fribidi-shape.c
|
||||||
|
renpybidicore.c
|
||||||
|
""".split()
|
||||||
|
cython(
|
||||||
|
"_renpybidi",
|
||||||
|
FRIBIDI_SOURCES,
|
||||||
|
+ ["fribidi"],
|
||||||
|
includes=[
|
||||||
|
- BASE + "/fribidi-src/",
|
||||||
|
- BASE + "/fribidi-src/lib/",
|
||||||
|
+ "@fribidi@/include/fribidi/",
|
||||||
|
],
|
||||||
|
define_macros=[
|
||||||
|
("FRIBIDI_ENTRY", ""),
|
||||||
|
- ("HAVE_CONFIG_H", "1"),
|
||||||
|
])
|
||||||
|
|
||||||
|
if not (android or ios or emscripten):
|
@ -147,6 +147,9 @@ stdenv.mkDerivation rec {
|
|||||||
"-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
|
"-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
|
||||||
"-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF"
|
"-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF"
|
||||||
"-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
|
"-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
|
||||||
|
|
||||||
|
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''
|
preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''
|
||||||
|
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ libxml2 freetype librevenge libvisio libwmf libemf2svg ];
|
buildInputs = [ libxml2 freetype librevenge libvisio libwmf libemf2svg ];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
# file RPATH_CHANGE could not write new RPATH
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Library and tools to convert Microsoft Visio documents (VSS and VSD) to SVG";
|
description = "Library and tools to convert Microsoft Visio documents (VSS and VSD) to SVG";
|
||||||
homepage = "https://github.com/kakwa/libvisio2svg";
|
homepage = "https://github.com/kakwa/libvisio2svg";
|
||||||
|
@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
|
|||||||
"-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}"
|
"-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}"
|
||||||
"-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}"
|
"-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}"
|
||||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||||
|
|
||||||
|
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = lib.optionalString withExamples ''
|
postInstall = lib.optionalString withExamples ''
|
||||||
|
@ -314,7 +314,7 @@ diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
|
|||||||
@@ -1,25 +0,0 @@
|
@@ -1,25 +0,0 @@
|
||||||
-
|
-
|
||||||
-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
|
-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
|
||||||
- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
|
- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null
|
||||||
- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
|
- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
|
||||||
- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
|
- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
|
||||||
- # We don't want to complain about out of date SDK unless the target needs to be remade.
|
- # We don't want to complain about out of date SDK unless the target needs to be remade.
|
||||||
@ -327,12 +327,14 @@ diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
|
|||||||
- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
|
- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
|
||||||
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
|
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
|
||||||
- else ifneq ($(CURRENT_MAC_SDK_VERSION),)
|
- else ifneq ($(CURRENT_MAC_SDK_VERSION),)
|
||||||
- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
|
- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
|
||||||
- else
|
- else
|
||||||
- $(info Unknown error resolving current platform SDK version.)
|
- $(info Unknown error resolving current platform SDK version.)
|
||||||
- endif
|
- endif
|
||||||
- $(info This requires a fresh build. Please wipe the build directory completely,)
|
- $(info This requires a fresh build of your project. Please wipe the build directory)
|
||||||
- $(info including any .qmake.stash and .qmake.cache files generated by qmake.)
|
- ifneq ($(EXPORT__QMAKE_STASH_),)
|
||||||
|
- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_))
|
||||||
|
- endif
|
||||||
- $(error ^)
|
- $(error ^)
|
||||||
- endif
|
- endif
|
||||||
- endif
|
- endif
|
||||||
|
@ -175,14 +175,16 @@ index 978d73f7d9..463e3c5579 100644
|
|||||||
QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint();
|
QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint();
|
||||||
|
|
||||||
qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint;
|
qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint;
|
||||||
@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
@@ -294,12 +294,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
||||||
if (!target)
|
if (!target)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
|
- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
|
||||||
- Q_ASSERT(nativeDrag);
|
- Q_ASSERT(nativeDrag);
|
||||||
- nativeDrag->exitDragLoop();
|
- nativeDrag->exitDragLoop();
|
||||||
- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
|
- // for internal drag'n'drop, don't override the action the drop event accepted
|
||||||
|
- if (!nativeDrag->currentDrag())
|
||||||
|
- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
|
||||||
+ QCocoaIntegration::instance()->drag();
|
+ QCocoaIntegration::instance()->drag();
|
||||||
|
|
||||||
// Qt starts drag-and-drop on a mouse button press event. Cococa in
|
// Qt starts drag-and-drop on a mouse button press event. Cococa in
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dvc-objects";
|
pname = "dvc-objects";
|
||||||
version = "0.0.23";
|
version = "0.0.24";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||||||
owner = "iterative";
|
owner = "iterative";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-kiPDBhqQQJkVR/PWCKd4OFCIRznY3y6pgXiBQ3hBaaM=";
|
hash = "sha256-Hy/KLmu5mEIUazRi+XesTbKe+or/fzFL8e0zdV2WtC0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
@ -17,14 +17,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-logging";
|
pname = "google-cloud-logging";
|
||||||
version = "3.2.0";
|
version = "3.2.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-DHFg4s1saEVhTk+IDqrmLaIM4nwjmBj72osp16YnruY=";
|
hash = "sha256-oREcVPdcbbBFMQz55xLm8Q0bemTrVwsj+4ew73A11Kw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -14,14 +14,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-monitoring";
|
pname = "google-cloud-monitoring";
|
||||||
version = "2.10.0";
|
version = "2.10.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-hnDzNkFluRjq/Bxk6NIXezGLDEMAcW4MLQG7F5U9Ez8=";
|
hash = "sha256-VQRCqlP0iCxYt50uzrVFSkvHrsYb3R8SmrdhZHxLFKw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -13,14 +13,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-speech";
|
pname = "google-cloud-speech";
|
||||||
version = "2.14.1";
|
version = "2.15.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-ImE08djcrhhC0VQJmL69hbfUDBALPUyW9IaSh1CIJqs=";
|
hash = "sha256-/KQ8QM21L5aDy5NuNgrfTPTckU1d1AgdfzHY7/SPFdg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -12,14 +12,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-vision";
|
pname = "google-cloud-vision";
|
||||||
version = "2.7.3";
|
version = "2.8.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-eS67OJ8VfmXYFMrhKBNP++Jt+Q1hxcWMWwymdd/P4vE=";
|
hash = "sha256-LOGfvz61Fw6QNH83lFe8TwI3a72fHLeTFFcqM9QL3QY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
{ lib
|
{ lib
|
||||||
|
, stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, GitPython
|
, GitPython
|
||||||
@ -63,6 +64,9 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
"test_apply_black_through_jupytext" # we can't do anything about ill-formatted notebooks
|
"test_apply_black_through_jupytext" # we can't do anything about ill-formatted notebooks
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
# requires access to trash
|
||||||
|
"test_load_save_rename"
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
|
@ -15,14 +15,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "parfive";
|
pname = "parfive";
|
||||||
version = "1.5.1";
|
version = "2.0.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "c411fd7269a49d1c72a964e97de474ec082115777b363aeed98a6595f90b8676";
|
sha256 = "sha256-/b4KrYg0mXoQJ/L+9ol7gD2myB0aLgDj0IWa8sxarKU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pubnub";
|
pname = "pubnub";
|
||||||
version = "6.3.3";
|
version = "6.4.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||||||
owner = pname;
|
owner = pname;
|
||||||
repo = "python";
|
repo = "python";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-OVciXd1u112h9tPNW5XpT7aDknpMGEYroe4m7HxBqaw=";
|
hash = "sha256-NpGhZrfUXKpz520l1S+cCfTrI2T/7XlO0Kk1e+XR8Ew=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
{ lib, buildPythonPackage, fetchurl, isPy27
|
{ lib, buildPythonPackage, fetchurl, isPy27, renpy
|
||||||
, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
|
, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pygame_sdl2";
|
pname = "pygame_sdl2";
|
||||||
version = "2.1.0";
|
version = "2.1.0";
|
||||||
renpy_version = "7.2.0";
|
renpy_version = renpy.base_version;
|
||||||
name = "${pname}-${version}-${renpy_version}";
|
name = "${pname}-${version}-${renpy_version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
|
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
|
||||||
sha256 = "1amgsb6mm8ssf7vdcs5dr8rlxrgyhh29m4i573z1cw61ynd7vgcw";
|
sha256 = "sha256-iKsnmuSBzfHlIOHUwWECfvPa9LuBbCr9Kmq5dolxUlU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# force rebuild of headers needed for install
|
# force rebuild of headers needed for install
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pylitterbot";
|
pname = "pylitterbot";
|
||||||
version = "2022.3.0";
|
version = "2022.7.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||||||
owner = "natekspencer";
|
owner = "natekspencer";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-hoDj7NbDQqXLA3I3Lmh9TBzmjluaJMz2aNPca6fXy+M=";
|
sha256 = "sha256-iniSlsZVWdDuwM/6asX4xyVrtrQvt7wEBwDVutjCogU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -4,11 +4,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jenkins";
|
pname = "jenkins";
|
||||||
version = "2.346.1";
|
version = "2.346.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||||
sha256 = "09rvwpywf8wc3605kc0x171kmxfigqg4dq7gkd1hng1xqbjjqvhp";
|
sha256 = "0ymp4zy73rxakk7i1pxai1i0hxp65ilzi57dan3mqspaprfllk7g";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
|
|||||||
"-DUSE_PCAP=1"
|
"-DUSE_PCAP=1"
|
||||||
"-DUSE_SSL=1"
|
"-DUSE_SSL=1"
|
||||||
"-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}"
|
"-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}"
|
||||||
|
|
||||||
|
# file RPATH_CHANGE could not write new RPATH
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
];
|
];
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
|
description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
|
||||||
maintainers = with maintainers; [ nshalman abbradar peterhoeg eyjhb ];
|
maintainers = with maintainers; [ abbradar peterhoeg eyjhb ];
|
||||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
homepage = "https://www.displaylink.com/";
|
homepage = "https://www.displaylink.com/";
|
||||||
|
@ -47,6 +47,9 @@ stdenv.mkDerivation rec {
|
|||||||
"-DWITH_CURL=ON"
|
"-DWITH_CURL=ON"
|
||||||
"-DWITH_CLIENT_WMS=ON"
|
"-DWITH_CLIENT_WMS=ON"
|
||||||
"-DWITH_CLIENT_WFS=ON"
|
"-DWITH_CLIENT_WFS=ON"
|
||||||
|
|
||||||
|
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
] ++ lib.optional withPython "-DWITH_PYTHON=ON";
|
] ++ lib.optional withPython "-DWITH_PYTHON=ON";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -7,21 +7,21 @@
|
|||||||
|
|
||||||
buildGo118Module rec {
|
buildGo118Module rec {
|
||||||
pname = "mattermost";
|
pname = "mattermost";
|
||||||
version = "7.0.1";
|
version = "7.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mattermost";
|
owner = "mattermost";
|
||||||
repo = "mattermost-server";
|
repo = "mattermost-server";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-oxZaOOV5pkK9HAi/AQ+MLZgfwvF6d/ArzYrXzUQGTDA=";
|
sha256 = "sha256-i5Ytn0o4gwQEkKzhHbFOn6BWEdYVsg24N0x/gxUzHAM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
webapp = fetchurl {
|
webapp = fetchurl {
|
||||||
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
|
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
|
||||||
sha256 = "sha256-NWVDPDqdx7mdWCr/qBi8HsUsCJbT63x37UZGecHsZr4=";
|
sha256 = "sha256-+GxzVTJDD5qIxVif0QjcnggydW7MvzNBvxG+6p7G7Q8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-0sKuk0klxeep8J96RntDP9DHsVM4vrOmsKXiaWurVis=";
|
vendorSha256 = "sha256-98riYN6MaBsKyaueogjXI7x3Lcionk0xcGt4DH684QU=";
|
||||||
|
|
||||||
subPackages = [ "cmd/mattermost" ];
|
subPackages = [ "cmd/mattermost" ];
|
||||||
|
|
||||||
|
@ -14,13 +14,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mu";
|
pname = "mu";
|
||||||
version = "1.8.5";
|
version = "1.8.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "djcb";
|
owner = "djcb";
|
||||||
repo = "mu";
|
repo = "mu";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "BbH8P5l3zoBKeyFUxJqXIn0sUqg80BApdJCoz+bG/uc=";
|
sha256 = "u3MN7MrfHt/ylxDoNnfwnAOKdOAbVZwvIukje0EYgOo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45
|
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45
|
||||||
docbook_xsl libxslt ];
|
docbook_xsl libxslt ];
|
||||||
|
|
||||||
cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];
|
cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||||
|
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
cp lib/* $out/lib
|
cp lib/* $out/lib
|
||||||
|
@ -1213,7 +1213,6 @@ mapAliases ({
|
|||||||
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12
|
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12
|
||||||
redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
|
redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
|
||||||
reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
|
reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
|
||||||
renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12
|
|
||||||
|
|
||||||
# 3 resholve aliases below added 2022-04-08; drop after 2022-11-30?
|
# 3 resholve aliases below added 2022-04-08; drop after 2022-11-30?
|
||||||
resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation";
|
resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation";
|
||||||
|
@ -3613,7 +3613,7 @@ with pkgs;
|
|||||||
|
|
||||||
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
|
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||||
electron = electron_17;
|
electron = electron_19;
|
||||||
};
|
};
|
||||||
element-desktop-wayland = writeScriptBin "element-desktop" ''
|
element-desktop-wayland = writeScriptBin "element-desktop" ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
@ -10073,6 +10073,8 @@ with pkgs;
|
|||||||
|
|
||||||
redsocks = callPackage ../tools/networking/redsocks { };
|
redsocks = callPackage ../tools/networking/redsocks { };
|
||||||
|
|
||||||
|
renpy = callPackage ../development/interpreters/renpy { };
|
||||||
|
|
||||||
rep = callPackage ../development/tools/rep { };
|
rep = callPackage ../development/tools/rep { };
|
||||||
|
|
||||||
repseek = callPackage ../applications/science/biology/repseek { };
|
repseek = callPackage ../applications/science/biology/repseek { };
|
||||||
@ -15857,6 +15859,8 @@ with pkgs;
|
|||||||
|
|
||||||
frame = callPackage ../development/libraries/frame { };
|
frame = callPackage ../development/libraries/frame { };
|
||||||
|
|
||||||
|
framesh = callPackage ../applications/blockchains/framesh { };
|
||||||
|
|
||||||
frp = callPackage ../tools/networking/frp { };
|
frp = callPackage ../tools/networking/frp { };
|
||||||
|
|
||||||
fsatrace = callPackage ../development/tools/misc/fsatrace { };
|
fsatrace = callPackage ../development/tools/misc/fsatrace { };
|
||||||
@ -27846,7 +27850,7 @@ with pkgs;
|
|||||||
ghostscript = null;
|
ghostscript = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix {
|
imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick {
|
||||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
|
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user