Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
fa7a0dbb82
|
|
@ -281,6 +281,7 @@ in
|
|||
#logstash = handleTest ./logstash.nix {};
|
||||
lorri = handleTest ./lorri/default.nix {};
|
||||
maddy = handleTest ./maddy.nix {};
|
||||
maestral = handleTest ./maestral.nix {};
|
||||
magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {};
|
||||
magnetico = handleTest ./magnetico.nix {};
|
||||
mailcatcher = handleTest ./mailcatcher.nix {};
|
||||
|
|
@ -315,6 +316,7 @@ in
|
|||
moosefs = handleTest ./moosefs.nix {};
|
||||
mpd = handleTest ./mpd.nix {};
|
||||
mpv = handleTest ./mpv.nix {};
|
||||
mtp = handleTest ./mtp.nix {};
|
||||
mumble = handleTest ./mumble.nix {};
|
||||
musescore = handleTest ./musescore.nix {};
|
||||
munin = handleTest ./munin.nix {};
|
||||
|
|
|
|||
72
nixos/tests/maestral.nix
Normal file
72
nixos/tests/maestral.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "maestral";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ peterhoeg ];
|
||||
};
|
||||
|
||||
nodes =
|
||||
let
|
||||
common = attrs:
|
||||
pkgs.lib.recursiveUpdate
|
||||
{
|
||||
imports = [ ./common/user-account.nix ];
|
||||
systemd.user.services.maestral = {
|
||||
description = "Maestral Dropbox Client";
|
||||
serviceConfig.Type = "exec";
|
||||
};
|
||||
}
|
||||
attrs;
|
||||
|
||||
in
|
||||
{
|
||||
cli = { ... }: common {
|
||||
systemd.user.services.maestral = {
|
||||
wantedBy = [ "default.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.maestral}/bin/maestral start --foreground";
|
||||
};
|
||||
};
|
||||
|
||||
gui = { ... }: common {
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.sddm.enable = true;
|
||||
displayManager.defaultSession = "plasma";
|
||||
desktopManager.plasma5.enable = true;
|
||||
desktopManager.plasma5.runUsingSystemd = true;
|
||||
displayManager.autoLogin = {
|
||||
enable = true;
|
||||
user = "alice";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services = {
|
||||
maestral = {
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.maestral-gui}/bin/maestral_qt";
|
||||
};
|
||||
# PowerDevil doesn't like our VM
|
||||
plasma-powerdevil.enable = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
let
|
||||
user = nodes.cli.config.users.users.alice;
|
||||
in
|
||||
''
|
||||
start_all()
|
||||
|
||||
with subtest("CLI"):
|
||||
# we need SOME way to give the user an active login session
|
||||
cli.execute("loginctl enable-linger ${user.name}")
|
||||
cli.systemctl("start user@${toString user.uid}")
|
||||
cli.wait_for_unit("maestral.service", "${user.name}")
|
||||
|
||||
with subtest("GUI"):
|
||||
gui.wait_for_x()
|
||||
gui.succeed("xauth merge ${user.home}/.Xauthority")
|
||||
gui.wait_for_window("^Desktop ")
|
||||
gui.wait_for_unit("maestral.service", "${user.name}")
|
||||
'';
|
||||
})
|
||||
109
nixos/tests/mtp.nix
Normal file
109
nixos/tests/mtp.nix
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "mtp";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ matthewcroughan nixinator ];
|
||||
};
|
||||
|
||||
nodes =
|
||||
{
|
||||
client = { config, pkgs, ... }: {
|
||||
# DBUS runs only once a user session is created, which means a user has to
|
||||
# login. Here, we log in as root. Once logged in, the gvfs-daemon service runs
|
||||
# as UID 0 in User-0.service
|
||||
services.getty.autologinUser = "root";
|
||||
|
||||
# XDG_RUNTIME_DIR is needed for running systemd-user services such as
|
||||
# gvfs-daemon as root.
|
||||
environment.variables.XDG_RUNTIME_DIR = "/run/user/0";
|
||||
|
||||
environment.systemPackages = with pkgs; [ usbutils glib jmtpfs tree ];
|
||||
services.gvfs.enable = true;
|
||||
|
||||
# Creates a usb-mtp device inside the VM, which is mapped to the host's
|
||||
# /tmp folder, it is able to write files to this location, but only has
|
||||
# permissions to read its own creations.
|
||||
virtualisation.qemu.options = [
|
||||
"-usb"
|
||||
"-device usb-mtp,rootdir=/tmp,readonly=false"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
let
|
||||
# Creates a list of QEMU MTP devices matching USB ID (46f4:0004). This
|
||||
# value can be sourced in a shell script. This is so we can loop over the
|
||||
# devices we find, as this test may want to use more than one MTP device
|
||||
# in future.
|
||||
mtpDevices = pkgs.writeScript "mtpDevices.sh" ''
|
||||
export mtpDevices=$(lsusb -d 46f4:0004 | awk {'print $2","$4'} | sed 's/[:-]/ /g')
|
||||
'';
|
||||
# Qemu is only capable of creating an MTP device with Picture Transfer
|
||||
# Protocol. This means that gvfs must use gphoto2:// rather than mtp://
|
||||
# when mounting.
|
||||
# https://github.com/qemu/qemu/blob/970bc16f60937bcfd334f14c614bd4407c247961/hw/usb/dev-mtp.c#L278
|
||||
gvfs = rec {
|
||||
mountAllMtpDevices = pkgs.writeScript "mountAllMtpDevices.sh" ''
|
||||
set -e
|
||||
source ${mtpDevices}
|
||||
for i in $mtpDevices
|
||||
do
|
||||
gio mount "gphoto2://[usb:$i]/"
|
||||
done
|
||||
'';
|
||||
unmountAllMtpDevices = pkgs.writeScript "unmountAllMtpDevices.sh" ''
|
||||
set -e
|
||||
source ${mtpDevices}
|
||||
for i in $mtpDevices
|
||||
do
|
||||
gio mount -u "gphoto2://[usb:$i]/"
|
||||
done
|
||||
'';
|
||||
# gvfsTest:
|
||||
# 1. Creates a 10M test file
|
||||
# 2. Copies it to the device using GIO tools
|
||||
# 3. Checks for corruption with `diff`
|
||||
# 4. Removes the file, then unmounts the disks.
|
||||
gvfsTest = pkgs.writeScript "gvfsTest.sh" ''
|
||||
set -e
|
||||
source ${mtpDevices}
|
||||
${mountAllMtpDevices}
|
||||
dd if=/dev/urandom of=testFile10M bs=1M count=10
|
||||
for i in $mtpDevices
|
||||
do
|
||||
gio copy ./testFile10M gphoto2://[usb:$i]/
|
||||
ls -lah /run/user/0/gvfs/*/testFile10M
|
||||
gio remove gphoto2://[usb:$i]/testFile10M
|
||||
done
|
||||
${unmountAllMtpDevices}
|
||||
'';
|
||||
};
|
||||
jmtpfs = {
|
||||
# jmtpfsTest:
|
||||
# 1. Mounts the device on a dir named `phone` using jmtpfs
|
||||
# 2. Puts the current Nixpkgs libmtp version into a file
|
||||
# 3. Checks for corruption with `diff`
|
||||
# 4. Prints the directory tree
|
||||
jmtpfsTest = pkgs.writeScript "jmtpfsTest.sh" ''
|
||||
set -e
|
||||
mkdir phone
|
||||
jmtpfs phone
|
||||
echo "${pkgs.libmtp.version}" > phone/tmp/testFile
|
||||
echo "${pkgs.libmtp.version}" > testFile
|
||||
diff phone/tmp/testFile testFile
|
||||
tree phone
|
||||
'';
|
||||
};
|
||||
in
|
||||
# Using >&2 allows the results of the scripts to be printed to the terminal
|
||||
# when building this test with Nix. Scripts would otherwise complete
|
||||
# silently.
|
||||
''
|
||||
start_all()
|
||||
client.wait_for_unit("multi-user.target")
|
||||
client.wait_for_unit("dbus.service")
|
||||
client.succeed("${gvfs.gvfsTest} >&2")
|
||||
client.succeed("${jmtpfs.jmtpfsTest} >&2")
|
||||
'';
|
||||
})
|
||||
|
|
@ -31,12 +31,12 @@ let
|
|||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "8s2auxTrq/ljBXOy+4RHvhkod3h9xOOWThtV9yqFkuw=";
|
||||
sha256 = "1zai8ivc9cqax2idspwvyp24dkis0x6sv29fia8ja3sp62i45171";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, fetchFromGitHub
|
||||
, python3
|
||||
, wrapQtAppsHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -44,6 +45,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
pythonImportsCheck = [ "maestral_qt" ];
|
||||
|
||||
passthru.tests.maestral = nixosTests.maestral;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI front-end for maestral (an open-source Dropbox client) for Linux";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
1986
pkgs/development/compilers/elm/packages/node-packages.nix
generated
1986
pkgs/development/compilers/elm/packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -102,6 +102,12 @@ let
|
|||
./0090-pipewire-config-template-paths.patch
|
||||
# Place SPA data files in lib output to avoid dependency cycles
|
||||
./0095-spa-data-dir.patch
|
||||
# Fixes missing function declarations in pipewire headers
|
||||
# Should be removed after the next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a2e98e28c1e6fb58b273ef582398d8bee4d2b769.patch";
|
||||
sha256 = "sha256-tqiiAW2fTEp23HT59XR2D/G08pVENJtpxUI7UVufj/A=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
|
||||
let
|
||||
pname = "composer";
|
||||
version = "2.2.9";
|
||||
version = "2.3.3";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getcomposer.org/download/${version}/composer.phar";
|
||||
sha256 = "sha256-SPn9ya2TkE/ullULRa4DpR9pcYUC7oVdqJS0rXHS3+A=";
|
||||
sha256 = "sha256-1pMewrOLQb0K1i+dFXkI5miLrAkbvwvWphnBBnuSJAI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
let
|
||||
pname = "phpstan";
|
||||
version = "1.5.0";
|
||||
version = "1.5.3";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
|
||||
sha256 = "sha256-dgsBpFnolIMrSwNHZ9+mSW1zMJ/RbvYIWBUksDiYeqE=";
|
||||
sha256 = "sha256-tIVzXxOyHVz2AE0PjQdkQ+uevdSqsjBRIZQWVDwzuKg=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncsleepiq";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pIfEdNmtnwA+PE3lXVd7Qd8Igj+/aqZmuDqFs60PxgY=";
|
||||
sha256 = "sha256-X+bJyzQxWJaS1/KNOE/3zQKSbwUpm9XN35HYf6s+BPs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, ase
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, datamodeldict
|
||||
|
|
@ -7,17 +8,19 @@
|
|||
, numericalunits
|
||||
, numpy
|
||||
, pandas
|
||||
, phonopy
|
||||
, potentials
|
||||
, pymatgen
|
||||
, pytest
|
||||
, pythonOlder
|
||||
, requests
|
||||
, scipy
|
||||
, toolz
|
||||
, xmltodict
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
pname = "atomman";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -27,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "usnistgov";
|
||||
repo = "atomman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-is47O59Pjrh9tPC1Y2+DVVcHbxmcjUOFOVGnNHuURoM=";
|
||||
hash = "sha256-iLAB0KMtrTCyGpx+81QfHDPVDhq8OA6CDL/ipVRpyo0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -38,19 +41,24 @@ buildPythonPackage rec {
|
|||
numpy
|
||||
pandas
|
||||
potentials
|
||||
requests
|
||||
scipy
|
||||
toolz
|
||||
xmltodict
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
ase
|
||||
phonopy
|
||||
pymatgen
|
||||
pytest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
# pytestCheckHook doesn't work
|
||||
py.test tests -k "not test_rootdir and not test_version \
|
||||
and not test_atomic_mass and not imageflags"
|
||||
pytest tests -k "not test_rootdir and not test_version \
|
||||
and not test_atomic_mass and not imageflags" \
|
||||
--ignore tests/plot/test_interpolate.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -7,15 +7,19 @@
|
|||
, future
|
||||
, pyyaml
|
||||
, jsonlines
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.8.15";
|
||||
version = "2.9.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f47bd324f80e91487dea2c79be934b1dc612bcfa63e784dcf74c6a2f52a41cc";
|
||||
hash = "sha256-rIIzwsGQidTRqE0eba7X/xicsMtWPxZ2PCGr6OUy+7U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -29,12 +33,15 @@ buildPythonPackage rec {
|
|||
|
||||
# no tests associated with package
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "CloudFlare" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"CloudFlare"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for the Cloudflare v4 API";
|
||||
homepage = "https://github.com/cloudflare/python-cloudflare";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deep-translator";
|
||||
version = "1.8.1";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Oi5dzrC19PnlExCOgu+bT5n3/XwgJkDirzl8ra8w7Nw=";
|
||||
sha256 = "sha256-9YTDvrm5Q8k5G7qDF05651IxMV1BeTcgIAMSxU/bwM0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,24 +2,32 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dotmap";
|
||||
version = "1.3.26";
|
||||
version = "1.3.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cc87300f3a61d70f2bd18103ea2747dea846a2381a8321f43ce65cbd7afdfe3d";
|
||||
hash = "sha256-gHCQIN8CIeF8TgHWeQu8GCRxK1aQFJJ/d7jZurxxMik=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "dotmap/test.py" ];
|
||||
pytestFlagsArray = [
|
||||
"dotmap/test.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dotmap" ];
|
||||
pythonImportsCheck = [
|
||||
"dotmap"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python for dot-access dictionaries";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "easygui";
|
||||
version = "0.98.2";
|
||||
version = "0.98.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "073f728ca88a77b74f404446fb8ec3004945427677c5618bd00f70c1b999fef2";
|
||||
sha256 = "sha256-1lP/ee4fQvY7WgkPL5jOAjNdhq2JY7POJmGAXK/pmgQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi";
|
||||
version = "0.75.0";
|
||||
version = "0.75.1";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "tiangolo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LCdScvQUdwOM8Don/5n/49bKrivT+bkhqWcBNku4fso=";
|
||||
sha256 = "sha256-tSZ5isMzDhDsuVNQdoYXG0IYkgCvdVdARtFXELNjTtk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glean-parser";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "glean_parser";
|
||||
inherit version;
|
||||
hash = "sha256-zUiF0buHBe0BaaeIRJcRoT/g+NhWv6XTuhCZ6WPrris=";
|
||||
hash = "sha256-PjOMNUnrz0kDfYEXv5Ni/9RIHn4Yylle6NJOK1Rb3SY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "idasen";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "newAM";
|
||||
repo = "idasen";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s8CnYMUVl2VbGbVxICSaKH5DxTA+NP/zPX1z7vfMqi4=";
|
||||
hash = "sha256-tjA7qgU3JYvwSdDH+aWrmKBX1Q9J5/UT7KjiTBxvKAE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,11 +39,6 @@ buildPythonPackage rec {
|
|||
pytest-asyncio
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'voluptuous = "^0.12"' 'voluptuous = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"idasen"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,26 +4,40 @@
|
|||
, django
|
||||
, six
|
||||
, pycrypto
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libthumbor";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0";
|
||||
hash = "sha256-1PsiFZrTDVQqy8A3nkaM5LdPiBoriRgHkklTOiczN+g=";
|
||||
};
|
||||
|
||||
buildInputs = [ django ];
|
||||
propagatedBuildInputs = [ six pycrypto ];
|
||||
buildInputs = [
|
||||
django
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
pycrypto
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"libthumbor"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "libthumbor is the python extension to thumbor";
|
||||
description = "Python extension to thumbor";
|
||||
homepage = "https://github.com/heynemann/libthumbor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,23 @@
|
|||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, python
|
||||
, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, survey, watchdog
|
||||
, click
|
||||
, desktop-notifier
|
||||
, dropbox
|
||||
, fasteners
|
||||
, keyring
|
||||
, keyrings-alt
|
||||
, packaging
|
||||
, pathspec
|
||||
, Pyro5
|
||||
, requests
|
||||
, setuptools
|
||||
, sdnotify
|
||||
, survey
|
||||
, watchdog
|
||||
, importlib-metadata
|
||||
, pytestCheckHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -66,6 +80,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "maestral" ];
|
||||
|
||||
passthru.tests.maestral = nixosTests.maestral;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source Dropbox client for macOS and Linux";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.74";
|
||||
version = "2.1.75";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SyKOwESn+0pFtm2GBFcS+kzIuv5cNXcayTtI7OyFpQg=";
|
||||
hash = "sha256-G5JE4/ZWZYo8Fpy3ZhIaWNzGfEkWb9qA9vL3UVTqf0Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,10 +16,11 @@
|
|||
, scipy
|
||||
, unidecode
|
||||
, xmltodict
|
||||
, yabadaba
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pname = "potentials";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -27,7 +28,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-u++ClAAc96u7k8w756sFR4oCtIOgERQ7foklxWWPprY=";
|
||||
hash = "sha256-kj2RDls5ziCH+AF982h8TplZccwdcna3BQMoBXAbOHE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -44,6 +45,7 @@ buildPythonPackage rec {
|
|||
scipy
|
||||
unidecode
|
||||
xmltodict
|
||||
yabadaba
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py3status";
|
||||
version = "3.42";
|
||||
version = "3.43";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2/YT36X4UvmmhiaxyJBtCKA3QuibYtReTS6MQ3YGV+c=";
|
||||
sha256 = "sha256-H37Jcd7wZmDiCn7fk0SmlWYj46D3w/B9BdsEwqgEBjw=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cython
|
||||
, enum34
|
||||
, glibcLocales
|
||||
, matplotlib
|
||||
, monty
|
||||
|
|
@ -11,10 +12,10 @@
|
|||
, plotly
|
||||
, pybtex
|
||||
, pydispatcher
|
||||
, pythonOlder
|
||||
, requests
|
||||
, ruamel-yaml
|
||||
, scipy
|
||||
, six
|
||||
, spglib
|
||||
, sympy
|
||||
, tabulate
|
||||
|
|
@ -23,14 +24,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymatgen";
|
||||
version = "2022.2.7";
|
||||
version = "2022.3.29";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# sdist doesn't include c files
|
||||
src = fetchFromGitHub {
|
||||
owner = "materialsproject";
|
||||
repo = "pymatgen";
|
||||
rev= "v${version}";
|
||||
sha256 = "sha256-92Dxmo1Z9LR2caSOftIf1I6jeZmqDe3SqhhoCofWraw=";
|
||||
hash = "sha256-B2piRWx9TfKlGTPOAAGsq2GxyfHIRBVFpk6dxES0WF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,7 +42,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
enum34
|
||||
matplotlib
|
||||
monty
|
||||
networkx
|
||||
|
|
@ -52,16 +54,18 @@ buildPythonPackage rec {
|
|||
requests
|
||||
ruamel-yaml
|
||||
scipy
|
||||
six
|
||||
spglib
|
||||
sympy
|
||||
tabulate
|
||||
uncertainties
|
||||
];
|
||||
|
||||
# No tests in pypi tarball.
|
||||
# Tests are not detected by pytest
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pymatgen" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pymatgen"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A robust materials analysis code that defines core object representations for structures and molecules";
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy-loggers";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-F9DiSbLmxlRsSfxlYaCmhfkajtvySlsrd1nq1EPHRlQ=";
|
||||
sha256 = "sha256-511E9M+Z5nY9cTLKfIxCDgqSeQIioIvI654k6iwTU24=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "2.69.0";
|
||||
version = "2.70.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iDB4/FvTc34dBYDDAIMjxYbaNreuhHmle40WE0DTy58=";
|
||||
hash = "sha256-7YiX9o5rrDOYzJmOtWNFUYQGMNZQTAAm/P0K2RyadKQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "thrift";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "87c8205a71cf8bbb111cb99b1f7495070fbc9cabb671669568854210da5b3e29";
|
||||
sha256 = "sha256-K1tkiPze0h+dMSqiPJ/2oBldD2ribdvVrZ4+Jd/BRAg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-freezegun";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6dEyfpjGyqj2XeABje0nQ0fo40GY1ZqppcJK2SZdXl4=";
|
||||
hash = "sha256-9LsIxUqkaBbHehtceipU9Tk8POWOfUAC5n+QgbQR6SE=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.27.15";
|
||||
version = "2.27.16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LTcRg8U1II0syP50c9m0nDRMcHfrcDAutwhjj7hghqg=";
|
||||
sha256 = "sha256-yAEMGLKRp++2CxRS2+ElMLwlaT3WV+cMYoA/zcS//ps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
57
pkgs/development/python-modules/yabadaba/default.nix
Normal file
57
pkgs/development/python-modules/yabadaba/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cdcs
|
||||
, datamodeldict
|
||||
, fetchFromGitHub
|
||||
, ipython
|
||||
, lxml
|
||||
, numpy
|
||||
, pandas
|
||||
, pymongo
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yabadaba";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usnistgov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Svw15epiSMEGMuFuMLqX2C9YFGtRtdg7DW2OVLPRmNI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cdcs
|
||||
datamodeldict
|
||||
ipython
|
||||
lxml
|
||||
numpy
|
||||
pandas
|
||||
pymongo
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"yabadaba"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Abstraction layer allowing for common interactions with databases and records";
|
||||
homepage = "https://github.com/usnistgov/yabadaba";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-deconz";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PctS09twk8SRK3pTJvQU8drsqhmrPnMge2WO+VY84U8=";
|
||||
sha256 = "sha256-QLEyEoX3gbrY/zvFmB1eah1wuc4bHH4S0D1B2WNHxaM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -38,21 +38,24 @@ stdenv.mkDerivation rec {
|
|||
SDL2
|
||||
SDL2_mixer
|
||||
makeWrapper
|
||||
Cocoa
|
||||
];
|
||||
] ++ lib.optional stdenv.isDarwin Cocoa;
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/lib/SpaceCadetPinball
|
||||
# Darwin needs a custom installphase since it is excluded from the cmake install
|
||||
# https://github.com/k4zmu2a/SpaceCadetPinball/blob/0f88e43ba261bc21fa5c3ef9d44969a2a079d0de/CMakeLists.txt#L221
|
||||
installPhase = lib.optionalString stdenv.isDarwin ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install ../bin/SpaceCadetPinball $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/SpaceCadetPinball
|
||||
install ${assets}/*.{DAT,DOC,MID,BMP,INF} ${assets}/Sounds/*.WAV $out/lib/SpaceCadetPinball
|
||||
|
||||
# Assets are loaded from the directory of the program is stored in
|
||||
# https://github.com/k4zmu2a/SpaceCadetPinball/blob/de13d4e326b2dfa8e6dfb59815c0a8b9657f942d/SpaceCadetPinball/winmain.cpp#L119
|
||||
cp ../bin/SpaceCadetPinball $out/bin
|
||||
cp $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball
|
||||
mv $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball
|
||||
makeWrapper $out/lib/SpaceCadetPinball/SpaceCadetPinball $out/bin/SpaceCadetPinball
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -206,12 +206,6 @@ in buildFHSUserEnv rec {
|
|||
++ steamPackages.steam-runtime-wrapped.overridePkgs
|
||||
++ extraLibraries pkgs;
|
||||
|
||||
extraBuildCommands = ''
|
||||
ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0
|
||||
'' + lib.optionalString (steam-runtime-wrapped-i686 != null) ''
|
||||
ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${steam}/share/icons $out/share
|
||||
|
|
@ -269,7 +263,7 @@ in buildFHSUserEnv rec {
|
|||
name = "steam-run";
|
||||
|
||||
targetPkgs = commonTargetPkgs;
|
||||
inherit multiPkgs extraBuildCommands profile extraInstallCommands;
|
||||
inherit multiPkgs profile extraInstallCommands;
|
||||
|
||||
inherit unshareIpc unsharePid;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.26.1";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ngCE1DhbbuOu07R69gSlFvDKl5EFtTGOkfr5e4u4Dkw=";
|
||||
sha256 = "sha256-iQ+Z1A/wiui2IHuK35e6T/44TYaf6+KbaDl5GfVF2vo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-lRnxZiJiq601oOXkxZqVNPXc0miK3TsAyGeVTjTxdhw=";
|
||||
cargoSha256 = "sha256-DMHIvqClBpBplvqqXM2dUOumO+Ean4yAHWDplJ9PaUM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandown
|
||||
|
|
|
|||
|
|
@ -10899,6 +10899,8 @@ in {
|
|||
|
||||
xxhash = callPackage ../development/python-modules/xxhash { };
|
||||
|
||||
yabadaba = callPackage ../development/python-modules/yabadaba { };
|
||||
|
||||
yahooweather = callPackage ../development/python-modules/yahooweather { };
|
||||
|
||||
yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue