mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 12:23:02 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
81a9b5cb82
@ -9,7 +9,17 @@ in {
|
||||
services.code-server = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "code-server");
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "code-server" { };
|
||||
package = lib.mkPackageOptionMD pkgs "code-server" {
|
||||
example = ''
|
||||
pkgs.vscode-with-extensions.override {
|
||||
vscode = pkgs.code-server;
|
||||
vscodeExtensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.nix
|
||||
dracula-theme.theme-dracula
|
||||
];
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
extraPackages = lib.mkOption {
|
||||
default = [ ];
|
||||
|
||||
@ -113,6 +113,7 @@ in
|
||||
|
||||
services.xserver.displayManager.sessionCommands = ''
|
||||
if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
|
||||
true
|
||||
${concatMapStrings (p: ''
|
||||
if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import ../make-test-python.nix ({ pkgs, ...}: let
|
||||
args@{ nextcloudVersion ? 27, ... }:
|
||||
(import ../make-test-python.nix ({ pkgs, ...}: let
|
||||
username = "custom_admin_username";
|
||||
# This will be used both for redis and postgresql
|
||||
pass = "hunter2";
|
||||
@ -9,7 +10,7 @@ import ../make-test-python.nix ({ pkgs, ...}: let
|
||||
in {
|
||||
name = "nextcloud-with-declarative-redis";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ eqyiel ];
|
||||
maintainers = [ eqyiel ma27 ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
@ -22,6 +23,7 @@ in {
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
hostName = "nextcloud";
|
||||
package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
|
||||
caching = {
|
||||
apcu = false;
|
||||
redis = true;
|
||||
@ -47,8 +49,11 @@ in {
|
||||
configureRedis = true;
|
||||
};
|
||||
|
||||
services.redis.servers."nextcloud".enable = true;
|
||||
services.redis.servers."nextcloud".port = 6379;
|
||||
services.redis.servers."nextcloud" = {
|
||||
enable = true;
|
||||
port = 6379;
|
||||
requirePass = "secret";
|
||||
};
|
||||
|
||||
systemd.services.nextcloud-setup= {
|
||||
requires = ["postgresql.service"];
|
||||
@ -114,4 +119,4 @@ in {
|
||||
# redis cache should not be empty
|
||||
nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"')
|
||||
'';
|
||||
})
|
||||
})) args
|
||||
|
||||
@ -89,5 +89,8 @@ in {
|
||||
"${withRcloneEnv} ${diffSharedFile}"
|
||||
)
|
||||
nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${adminuser}\"")
|
||||
|
||||
# redis cache should not be empty
|
||||
nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"')
|
||||
'';
|
||||
})) args
|
||||
|
||||
35
pkgs/applications/editors/codux/default.nix
Normal file
35
pkgs/applications/editors/codux/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, appimageTools
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "codux";
|
||||
version = "15.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
|
||||
sha256 = "sha256-6XLKXw+e/310mCQxM/X/kzok562vGjEhmF1eLfakB4Q=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A visual IDE for React";
|
||||
homepage = "https://www.codux.com";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
@ -95,5 +95,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ AngryAnt ];
|
||||
mainProgram = "ILSpy";
|
||||
};
|
||||
}
|
||||
|
||||
@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
mock
|
||||
mypy
|
||||
mypy-extensions
|
||||
dbus-python
|
||||
pygobject3
|
||||
pyinotify
|
||||
|
||||
@ -2,20 +2,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vieb";
|
||||
version = "9.7.1";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jelmerro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-1G3hhqWMClxdwt3aOmnAbEV+n2ui5X6Cgf30391OVi0=";
|
||||
hash = "sha256-twTP/EvUUySG9RRHoljVZFIfFK5mjPA4KcQUvOXg2xI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/"electron"/d' package.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-t8fKbh9M63CCkxwlXj3zGvP8y5uLMqbyNd8BimBhIBc=";
|
||||
npmDepsHash = "sha256-RbkZ3lK4t5HcFDeaM6rXnGXZpsJxj4JPObZtHn0TVcU=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubefirst";
|
||||
version = "2.1.0";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubefirst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t5tbgLXpJX2yWUdEW7zKb4A7B7budAOitOkL5I2CWpk=";
|
||||
hash = "sha256-puqMekP2NkcbW4zD6abwW61CJcqjkALWpCpctaN7+lA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-D2Gi90seLPTM0ttlz7V6FW1ZMiVN22YLWKeTquXvagY=";
|
||||
vendorHash = "sha256-BZ/GopEm3hIqtCxiB+eiXiL/Vk2fUhP1Ixx18brM7Ow=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"];
|
||||
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGo120Package
|
||||
, buildGoPackage
|
||||
}:
|
||||
|
||||
buildGo120Package rec {
|
||||
buildGoPackage rec {
|
||||
pname = "ssm-session-manager-plugin";
|
||||
version = "1.2.463.0";
|
||||
|
||||
@ -14,7 +13,7 @@ buildGo120Package rec {
|
||||
owner = "aws";
|
||||
repo = "session-manager-plugin";
|
||||
rev = version;
|
||||
sha256 = "sha256-0n7/3CAPf+ioSE041Zik9xeHt5qtrdHotJjBWhizExo=";
|
||||
hash = "sha256-0n7/3CAPf+ioSE041Zik9xeHt5qtrdHotJjBWhizExo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, buildPythonApplication
|
||||
, fetchpatch
|
||||
, pem
|
||||
, pyside6
|
||||
, twisted
|
||||
, certifi
|
||||
@ -30,10 +31,11 @@ buildPythonApplication rec {
|
||||
url = "https://github.com/Syncplay/syncplay/commit/b62b038cdf58c54205987dfc52ebf228505ad03b.patch";
|
||||
hash = "sha256-pSP33Qn1I+nJBW8T1E1tSJKRh5OnZMRsbU+jr5z4u7c=";
|
||||
})
|
||||
./trusted_certificates.patch
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals enableGUI [ (if stdenv.isLinux then qt6.qtwayland else qt6.qtbase) ];
|
||||
propagatedBuildInputs = [ twisted certifi ]
|
||||
propagatedBuildInputs = [ certifi pem twisted ]
|
||||
++ twisted.optional-dependencies.tls
|
||||
++ lib.optional enableGUI pyside6
|
||||
++ lib.optional (stdenv.isDarwin && enableGUI) appnope;
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/syncplay/client.py b/syncplay/client.py
|
||||
index b7cb245..be72d94 100755
|
||||
--- a/syncplay/client.py
|
||||
+++ b/syncplay/client.py
|
||||
@@ -848,6 +848,7 @@ class SyncplayClient(object):
|
||||
self._endpoint = HostnameEndpoint(reactor, host, port)
|
||||
try:
|
||||
certs = pem.parse_file(SSL_CERT_FILE)
|
||||
+ certs = [cert for cert in certs if type(cert) is pem.Certificate]
|
||||
trustRoot = trustRootFromCertificates([Certificate.loadPEM(str(cert)) for cert in certs])
|
||||
self.protocolFactory.options = optionsForClientTLS(hostname=host, trustRoot=trustRoot)
|
||||
self._clientSupportsTLS = True
|
||||
@ -27,14 +27,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackbox";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "raggesilver";
|
||||
repo = "blackbox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WeR7zdYdRWBR+kmxLjRFE6QII9RdBig7wrbVoCPA5go=";
|
||||
hash = "sha256-qz1805HLG/Yexilw0YCkTzed1wqonUtJ+QrbMyhKHh8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghorg";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrie30";
|
||||
repo = "ghorg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-beFZRH5FG6aEvMhjsheeBHxqHRH0jkRt5FDYkeyrc2E=";
|
||||
sha256 = "sha256-++jUs/V4luOWNjCrZpJAT/08aEr00kvl4vDxKTqA5fc=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit pname version;
|
||||
@ -15,10 +15,10 @@ buildGoModule rec {
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-odcgO7n39sPUdLaAEQqxx2dZrgmvH3fpqmUYB41GZAE=";
|
||||
hash = "sha256-rghjOfQXs7udTjBdsCG6Rx7gI/6WGkRPXE/fsGCTCxA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V94g7Ua8GWUOWM8Z4ENXmZlHXRUMHb8cKuoTztjHtnc=";
|
||||
vendorHash = "sha256-xeOWbfKy+LeInxcRM9evE/kmqlWlKy0mcHopWpc/DO0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -4,18 +4,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "113.0";
|
||||
version = "114.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "f2871094c45bc3a8a2604cbba5b34da27d676af7";
|
||||
sha256 = "seeqr453Qjk1MoYq2ZlPsgUOMaV7PbK4MKze2cl2NvI=";
|
||||
rev = "a8b48953a7d209b32d34fe64e2324cb1113b4336";
|
||||
sha256 = "PdP+Jx2oIAy+gxHjJDU5YlAlSYFtoX7ey3r5ELD9QPM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoSha256 = "hGhYzynNvsaSQO2lSEh/OGWkeE8bEinwb0QxX87TQU0=";
|
||||
cargoSha256 = "EhxrtCGrwCcODCjPUONjY1glPGEXbjvk6No/g2kJzI8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "distrobox";
|
||||
version = "1.4.2.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "89luca89";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-s3lq1Xr2y29cmyT1nY5/amiDA9dNfyGaMtjTvUINSD8=";
|
||||
sha256 = "sha256-6VsQLouK9gwBwbTdprtOgcBKJ0VD8pC/h49AcjS4F3U=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pytest-mypy
|
||||
, pythonOlder
|
||||
, tenacity
|
||||
}:
|
||||
@ -21,14 +19,18 @@ buildPythonPackage rec {
|
||||
sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace "--cov --cov-append --cov-fail-under=30 --cov-report=" "" \
|
||||
--replace "--mypy" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
tenacity
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov
|
||||
pytest-mypy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asteval";
|
||||
version = "0.9.29";
|
||||
version = "0.9.30";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,11 +17,16 @@ buildPythonPackage rec {
|
||||
owner = "newville";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cJIrb0lo/FmeyZd8L6nlCEt6MP7Fdv3rr5C6xvplN6c=";
|
||||
hash = "sha256-vKPMA8yiTNQPYehDVo6mleOv82ZNxHgi8P/HIOZb9/o=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov=asteval --cov-report xml" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
@ -30,18 +35,19 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov=asteval --cov-report xml" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asteval"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: 'ImportError' != None
|
||||
"test_set_default_nodehandler"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AST evaluator of Python expression using ast module";
|
||||
homepage = "https://github.com/newville/asteval";
|
||||
changelog = "https://github.com/newville/asteval/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, typing-inspect
|
||||
, marshmallow-enum
|
||||
, hypothesis
|
||||
, mypy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@ -26,14 +25,14 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
mypy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
disabledTestPaths = [
|
||||
# fails with the following error and avoid dependency on mypy
|
||||
# mypy_main(None, text_io, text_io, [__file__], clean_exit=True)
|
||||
# TypeError: main() takes at most 4 arguments (5 given)
|
||||
"test_type_hints"
|
||||
"tests/test_annotations.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dataclasses_json" ];
|
||||
|
||||
39
pkgs/development/python-modules/django-leaflet/default.nix
Normal file
39
pkgs/development/python-modules/django-leaflet/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ pkgs
|
||||
, buildPythonPackage
|
||||
, django
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-leaflet";
|
||||
version = "0.29.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L23Ixxh/0i5itvK3tC7thpIPgb7DEqplSYHr5byOCGY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
];
|
||||
|
||||
# The tests seem to be impure.
|
||||
# They are throwing a error about unset configs:
|
||||
# > django.core.exceptions.ImproperlyConfigured: Requested setting LEAFLET_CONFIG, but settings are not configured.
|
||||
doCheck = false;
|
||||
|
||||
# This dosn't work either because of the same exception as above
|
||||
# pythonImportsCheck = [ "leaflet" ];
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "Allows you to use Leaflet in your Django projects";
|
||||
homepage = "https://github.com/makinacorpus/django-leaflet";
|
||||
changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ janik ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,6 @@
|
||||
, buildPythonPackage
|
||||
, duckdb
|
||||
, google-cloud-storage
|
||||
, mypy
|
||||
, numpy
|
||||
, pandas
|
||||
, psutil
|
||||
@ -15,9 +14,8 @@ buildPythonPackage rec {
|
||||
inherit (duckdb) pname version src patches;
|
||||
format = "setuptools";
|
||||
|
||||
# we can't use sourceRoot otherwise patches don't apply, because the patches
|
||||
# apply to the C++ library
|
||||
postPatch = ''
|
||||
# we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library
|
||||
cd tools/pythonpkg
|
||||
|
||||
# 1. let nix control build cores
|
||||
@ -25,6 +23,9 @@ buildPythonPackage rec {
|
||||
substituteInPlace setup.py \
|
||||
--replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" \
|
||||
--replace "setuptools_scm<7.0.0" "setuptools_scm"
|
||||
|
||||
# avoid dependency on mypy
|
||||
rm tests/stubs/test_stubs.py
|
||||
'';
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -41,7 +42,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
google-cloud-storage
|
||||
mypy
|
||||
psutil
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-S2gU16kO8QVdhgjsfIeuv0ypcYSjWOFaVFGJdQsdijg=";
|
||||
hash = "sha256-ff/pPziFbU7sbcffzq0/3tHnS7MOCCVKV0G01JSNVGU=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, normality
|
||||
, mypy
|
||||
, coverage
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "fingerprints";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GZmurg3rpD081QZW/LUKWblhsQQSS6lg9O7y/kGy4To=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alephdata";
|
||||
repo = "fingerprints";
|
||||
rev = version;
|
||||
hash = "sha256-rptBM08dvivfglPvl3PZd9V/7u2SHbJ/BxfVHNGMt3A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -20,15 +20,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mypy
|
||||
coverage
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fingerprints"
|
||||
];
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, mypy
|
||||
, pyjwt
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -34,7 +33,6 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mypy
|
||||
pytestCheckHook
|
||||
responses
|
||||
];
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-python-client";
|
||||
version = "2.84.0";
|
||||
version = "2.88.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-w5j9b56tC+I6reOycExyxRRt8OM1LY/5EBKGB34bAQo=";
|
||||
hash = "sha256-NwaEU/eeoo5TlKj+IKS6YgWU5/hUEGi+ouhE2s3MnTM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, mypy
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
@ -21,12 +20,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-yW+pmAryBp6bvjolN91ACDkk5zxvKfu4nRLQSy71kqs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm tests/conftest.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mypy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -35,6 +37,11 @@ buildPythonPackage rec {
|
||||
"testMypyImmu"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# avoid dependency on mypy
|
||||
"tests/test_mypy.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"immutables"
|
||||
];
|
||||
|
||||
@ -4,11 +4,11 @@ let
|
||||
pythonEnv = lib.optional isPy27 mock;
|
||||
in buildPythonPackage rec {
|
||||
pname = "json-rpc";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/13xx/2G4dvQJZ8GWZdRzpGnx5DykEFHk6Vlq1ht3FI=";
|
||||
hash = "sha256-5kQdVsHc1UJByTfQotzRk73wvcU5tTFlJHE/VUt/hbk=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ];
|
||||
|
||||
@ -2,10 +2,8 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, mypy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
@ -28,14 +26,19 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
colorama
|
||||
freezegun
|
||||
mypy
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
disabledTestPaths = [
|
||||
"tests/test_type_hinting.py" # avoid dependency on mypy
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"tests/test_multiprocessing.py"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
disabledTests = [
|
||||
# fails on some machine configurations
|
||||
# AssertionError: assert '' != ''
|
||||
"test_file_buffering"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_rotation_and_retention"
|
||||
"test_rotation_and_retention_timed_file"
|
||||
"test_renaming"
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, pytest-mypy-plugins
|
||||
, typing-extensions
|
||||
, qtpy
|
||||
, pyside2
|
||||
@ -27,7 +26,7 @@
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ];
|
||||
nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
doCheck = false; # Reports "Fatal Python error"
|
||||
|
||||
|
||||
52
pkgs/development/python-modules/meeko/default.nix
Normal file
52
pkgs/development/python-modules/meeko/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rdkit
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meeko";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "forlilab";
|
||||
repo = "Meeko";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BCkKRwz3jK5rNAMtKcGxuvfdIFxRRJpABcedyd1zSKE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "python_requires='>=3.5.*'" "python_requires='>=3.5'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# setup.py only requires numpy but others are needed at runtime
|
||||
numpy
|
||||
rdkit
|
||||
scipy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"meeko"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python package for preparing small molecule for docking";
|
||||
homepage = "https://github.com/forlilab/Meeko";
|
||||
changelog = "https://github.com/forlilab/Meeko/releases/tag/${src.rev}";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.26.127";
|
||||
version = "1.26.155";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DlSLl8aiWJ97/10mocoQFiJ0l3E3kibjrQgiYp0GE8U=";
|
||||
hash = "sha256-Kjmau6jEW3uz82I7r4aFhiXXsOWpAu3+fZ+hj8vrL3s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
|
||||
# build-system
|
||||
@ -32,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy";
|
||||
version = "1.0.1";
|
||||
version = "1.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -41,24 +40,9 @@ buildPythonPackage rec {
|
||||
owner = "python";
|
||||
repo = "mypy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vxPEUDC6fkYYiOl5nHf0qwMgPDC+9Vw56eTUQ174raQ=";
|
||||
hash = "sha256-dfKuIyzgZo5hAZHighpXH78dHJ1PMbyCakyxF34CnMQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatibility with setupptools>=67.4.0
|
||||
(fetchpatch {
|
||||
# https://github.com/python/mypy/pull/14781
|
||||
url = "https://github.com/python/mypy/commit/ab7b69a0532a5fe976c9c2a1b713d82d630692a4.patch";
|
||||
hash = "sha256-dtzmoOZP3tOtxrBVhgqpdv+rnrTjTKHxQhBieuJXRtA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://github.com/python/mypy/pull/14787
|
||||
url = "https://github.com/python/mypy/commit/243f584d43e6eb316920f3155067ce7c1b65d473.patch";
|
||||
hash = "sha256-uuh3S5ZyuJeTXyMvav2uSEao2qq23xMjK8rJjkY8RCY=";
|
||||
includes = [ "mypyc/build.py" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
mypy-extensions
|
||||
setuptools
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-extensions";
|
||||
version = "0.4.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python";
|
||||
repo = "mypy_extensions";
|
||||
rev = version;
|
||||
hash = "sha256-JjhbxX5DBAbcs1o2fSWywz9tot792q491POXiId+NyI=";
|
||||
hash = "sha256-gOfHC6dUeBE7SsWItpUHHIxW3wzhPM5SuGW1U8P7DD0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing;
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, pytestCheckHook
|
||||
, beartype
|
||||
, invoke
|
||||
, mypy
|
||||
, numpy
|
||||
, pandas
|
||||
, feedparser
|
||||
@ -34,7 +33,6 @@ buildPythonPackage rec {
|
||||
beartype
|
||||
feedparser
|
||||
invoke
|
||||
mypy
|
||||
pandas
|
||||
pytestCheckHook
|
||||
typeguard
|
||||
|
||||
46
pkgs/development/python-modules/pem/default.nix
Normal file
46
pkgs/development/python-modules/pem/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, certifi
|
||||
, cryptography
|
||||
, pretend
|
||||
, pyopenssl
|
||||
, twisted
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pem";
|
||||
version = "21.2.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hynek";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-mftLdgtgb5J4zwsb1F/4v4K7XTy4VSZBMy3zPV2f1uA=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
certifi
|
||||
cryptography
|
||||
pretend
|
||||
pyopenssl
|
||||
pytestCheckHook
|
||||
twisted
|
||||
twisted.optional-dependencies.tls
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pem"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pem.readthedocs.io/";
|
||||
description = "Easy PEM file parsing in Python.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nyanotech ];
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,6 @@
|
||||
, pillow
|
||||
, poetry-core
|
||||
, pytest-benchmark
|
||||
, pytest-mypy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
@ -31,13 +30,10 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pillow
|
||||
pytest-benchmark
|
||||
pytest-mypy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# Incompatible types in assignment
|
||||
#"--mypy"
|
||||
"--benchmark-disable"
|
||||
];
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, freezegun
|
||||
, jsonpickle
|
||||
, munch
|
||||
, mypy
|
||||
, pyserial
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -48,7 +47,6 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
freezegun
|
||||
jsonpickle
|
||||
mypy
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pytest-mypy
|
||||
, pythonOlder
|
||||
, redis
|
||||
}:
|
||||
@ -25,7 +24,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mypy
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@ -41,6 +39,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/WoLpH/portalocker";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
platforms = platforms.unix; # Windows has a dependency on pypiwin32
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, mypy-extensions
|
||||
, numpy
|
||||
, pydantic
|
||||
, pytest-mypy-plugins
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
@ -42,7 +41,6 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
numpy
|
||||
pydantic
|
||||
pytest-mypy-plugins
|
||||
pytestCheckHook
|
||||
wrapt
|
||||
];
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, fetchFromGitHub
|
||||
, loguru
|
||||
, pytest-asyncio
|
||||
, pytest-mypy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
@ -24,8 +23,9 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/--cov/d' pytest.ini
|
||||
sed -i '/--mypy/d' pytest.ini
|
||||
sed -i pytest.ini \
|
||||
-e '/--cov/d' \
|
||||
-e '/--mypy/d'
|
||||
'';
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
@ -36,7 +36,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mypy
|
||||
pytestCheckHook
|
||||
] ++ passthru.optional-dependencies.loguru;
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywerview";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "the-useless-one";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+fSYDaN0nsffL1icx2nAIJydzwT+JB6qF9u+5b3RPK8=";
|
||||
hash = "sha256-0vL1kMg4XRFq1CWR/2x5YYyfjm8YzjJaXkezehsT4hg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, mpd2
|
||||
, mypy
|
||||
, pango
|
||||
, pkg-config
|
||||
, psutil
|
||||
@ -82,11 +81,6 @@ buildPythonPackage rec {
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
# for `qtile check`, needs `stubtest` and `mypy` commands
|
||||
makeWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ mypy ]}"
|
||||
];
|
||||
|
||||
doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,13 +5,9 @@
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, hypothesis
|
||||
, mypy
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pytest-aio
|
||||
, pytest-cov
|
||||
, pytest-mypy
|
||||
, pytest-mypy-plugins
|
||||
, pytest-subtests
|
||||
, setuptools
|
||||
, trio
|
||||
@ -30,6 +26,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-28WYjrjmu3hQ8+Snuvl3ykTd86eWYI97AE60p6SVwDQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i setup.cfg \
|
||||
-e '/--cov.*/d' \
|
||||
-e '/--mypy.*/d'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -38,17 +40,17 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
rm -rf returns/contrib/mypy
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
anyio
|
||||
curio
|
||||
httpx
|
||||
hypothesis
|
||||
mypy
|
||||
pytestCheckHook
|
||||
pytest-aio
|
||||
pytest-cov
|
||||
pytest-mypy
|
||||
pytest-mypy-plugins
|
||||
pytest-subtests
|
||||
setuptools
|
||||
trio
|
||||
@ -58,7 +60,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Make your functions return something meaningful, typed, and safe!";
|
||||
homepage = "returns.rtfd.io";
|
||||
homepage = "https://github.com/dry-python/returns";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.jessemoore ];
|
||||
};
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqltrie";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-f3nQMkDI4n/hORW038KL+LQcyc6Hzx1MDrcChk7W8t4=";
|
||||
hash = "sha256-+o0JY572q3qSX4FeXsk9ke0hn94Om/N6HN3HNoUgSkc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, asgiref
|
||||
, backports-cached-property
|
||||
, buildPythonPackage
|
||||
, chalice
|
||||
, channels
|
||||
@ -16,7 +15,6 @@
|
||||
, freezegun
|
||||
, graphql-core
|
||||
, libcst
|
||||
, mypy
|
||||
, opentelemetry-api
|
||||
, opentelemetry-sdk
|
||||
, poetry-core
|
||||
@ -149,7 +147,6 @@ buildPythonPackage rec {
|
||||
daphne
|
||||
email-validator
|
||||
freezegun
|
||||
mypy
|
||||
pytest-asyncio
|
||||
pytest-emoji
|
||||
pytest-mock
|
||||
@ -168,6 +165,7 @@ buildPythonPackage rec {
|
||||
"tests/django/test_dataloaders.py"
|
||||
"tests/exceptions/"
|
||||
"tests/http/"
|
||||
"tests/mypy/test_plugin.py" # avoid dependency on mypy
|
||||
"tests/schema/extensions/"
|
||||
"tests/schema/test_dataloaders.py"
|
||||
"tests/schema/test_lazy/"
|
||||
|
||||
41
pkgs/development/python-modules/summarytools/default.nix
Normal file
41
pkgs/development/python-modules/summarytools/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, ipython
|
||||
, matplotlib
|
||||
, numpy
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "summarytools";
|
||||
version = "0.2.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# no version tags in GitHub repo
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wsDf9IXCMQe0cVfQQuRVwMhxkhhUxbPu06yWZPLvgw4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
matplotlib
|
||||
numpy
|
||||
pandas
|
||||
];
|
||||
|
||||
nativeCheckImports = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "summarytools" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python port of the R summarytools package for summarizing dataframes";
|
||||
homepage = "https://github.com/6chaoran/jupyter-summarytools";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,6 @@
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, pytest-mypy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, regex
|
||||
@ -28,7 +27,6 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-mypy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, fetchFromGitHub
|
||||
, future-typing
|
||||
, inflection
|
||||
, mypy
|
||||
, orjson
|
||||
, pandas
|
||||
, pendulum
|
||||
@ -45,7 +44,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mypy
|
||||
pydantic
|
||||
sqlalchemy
|
||||
pandas
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, isPy3k
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, flake8-import-order
|
||||
@ -7,6 +6,7 @@
|
||||
, tomli
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
@ -15,7 +15,8 @@ buildPythonPackage rec {
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
# upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error
|
||||
disabled = pythonOlder "3.7" || pythonAtLeast "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlalchemyorg";
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
nixosTests }:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.47.0";
|
||||
version = "3.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Hj1KaRgH4LOacLwHKoJfIKJ5ueNEgqWVEZrIvMl+bf4=";
|
||||
sha256 = "sha256-Bg5g/0J3A1Snh1KV+dMFAvFXFo1oOljUhDQ4nomAzKM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2yVykKfjNAlo4jUpcsUnpVaQoBLZF7xbzYQxOZqNiTQ=";
|
||||
vendorHash = "sha256-bPfEl6wzYSDcAaVcKyKRfTbDV15xo5Au2xKrJfccweo=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kind";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kind";
|
||||
sha256 = "sha256-JMOfnpoDFP7UWT5FvrZeEkFUYxvGYFpnbkIiJoSfAFk=";
|
||||
sha256 = "sha256-5yDoxrsnmz8N0Y35juItLtyclTz+pSb75B1P716XPxU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,20 +1,19 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, php, phpPackages }:
|
||||
|
||||
let
|
||||
version = "2023.01.21";
|
||||
version = "2023.06.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpactor";
|
||||
repo = "phpactor";
|
||||
rev = version;
|
||||
hash = "sha256-jWZgBEaffjQ5wCStSEe+eIi7BJt6XAQFEjmq5wvW5V8=";
|
||||
hash = "sha256-NI+CLXlflQ8zQ+0AbjhJFdV6Y2+JGy7XDj0RBJ4YRRg=";
|
||||
};
|
||||
|
||||
vendor = stdenvNoCC.mkDerivation rec {
|
||||
vendor = stdenvNoCC.mkDerivation {
|
||||
pname = "phpactor-vendor";
|
||||
inherit src version;
|
||||
|
||||
|
||||
# See https://github.com/NixOS/nix/issues/6660
|
||||
dontPatchShebangs = true;
|
||||
|
||||
@ -45,7 +44,7 @@ let
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-7R6nadWFv7A5Hv14D9egsTD/zcKK5uK9LQlHmwtbKdE=";
|
||||
outputHash = "sha256-fjcfdNzQsVgRpksxybSIpdHz1BOLTlY49Cjeaw0Evl8=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.145.0";
|
||||
version = "0.147.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0X+cYDlc7yIJTA4O06Y5roj6bL7mQlZK7jIAs0RbM7U=";
|
||||
sha256 = "sha256-G23KJe0KvqdFOfuvbPHPiTOz/++IEFl3SKqqS+MsD2o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-brfrAD4cJ/MwT9ZiwN6a25vCWTcRMiszbuLWj3Lk2Kc=";
|
||||
vendorHash = "sha256-E8ianic0W63P52qXCn2EKjZC9pAQ1bkLCx0jobD2/UE=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@ -15,6 +15,11 @@ python3Packages.buildPythonApplication rec {
|
||||
hash = "sha256-e/gKBgbtjO2XYnAIdHDoVJWyP6cyvsuIFLrV/eqjces=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# remove --cov* options provided to pytest
|
||||
sed -i '/^addopts = "--cov/d' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
poetry-core
|
||||
];
|
||||
@ -41,9 +46,9 @@ python3Packages.buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
'';
|
||||
disabledTests = [
|
||||
"test_checks" # broken because new mypy release added new checks
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"refurb"
|
||||
|
||||
@ -27,7 +27,7 @@ in {
|
||||
sed -i 's|locations=.*|locations=${lua}/lib|' ${dir}/thirdparty/configure-native-deps.sh
|
||||
'';
|
||||
|
||||
wrapLaunchGame = openraSuffix: ''
|
||||
wrapLaunchGame = openraSuffix: binaryName: ''
|
||||
# Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542
|
||||
# https://github.com/mono/mono/issues/6752#issuecomment-365212655
|
||||
wrapProgram $out/lib/openra${openraSuffix}/launch-game.sh \
|
||||
@ -35,7 +35,7 @@ in {
|
||||
--prefix LD_LIBRARY_PATH : "${rpath}" \
|
||||
--set TERM xterm
|
||||
|
||||
makeWrapper $out/lib/openra${openraSuffix}/launch-game.sh $(mkdirp $out/bin)/openra${openraSuffix} \
|
||||
makeWrapper $out/lib/openra${openraSuffix}/launch-game.sh $(mkdirp $out/bin)/${binaryName} \
|
||||
--chdir "$out/lib/openra${openraSuffix}"
|
||||
'';
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
${wrapLaunchGame ""}
|
||||
${wrapLaunchGame "" "openra"}
|
||||
|
||||
${concatStrings (map (mod: ''
|
||||
makeWrapper $out/bin/openra $out/bin/openra-${mod} --add-flags Game.Mod=${mod}
|
||||
|
||||
@ -8,7 +8,7 @@ show_error() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
cd "@out@/lib/openra-@name@"
|
||||
pushd "@out@/lib/openra_2019-@name@" > /dev/null
|
||||
|
||||
# Check for missing assets
|
||||
assetsError='@assetsError@'
|
||||
@ -17,7 +17,7 @@ if [[ -n "$assetsError" && ! -d "$HOME/.openra/Content/@name@" ]]; then
|
||||
fi
|
||||
|
||||
# Run the game
|
||||
mono --debug OpenRA.Game.exe Game.Mod=@name@ Engine.LaunchPath="@out@/bin/openra-@name@" Engine.ModSearchPaths="@out@/lib/openra-@name@/mods" "$@"
|
||||
mono --debug OpenRA.Game.exe Game.Mod=@name@ Engine.LaunchPath="@out@/bin/openra-@name@" Engine.ModSearchPaths="@out@/lib/openra_2019-@name@/mods" "$@"
|
||||
|
||||
# Show a crash dialog if something went wrong
|
||||
if (( $? != 0 && $? != 1 )); then
|
||||
|
||||
@ -70,14 +70,14 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
||||
cp -r ${engineSourceName}/mods/{${concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/* \
|
||||
$out/lib/${pname}/mods/
|
||||
|
||||
substitute ${./mod-launch-game.sh} $out/lib/${pname}/launch-game.sh \
|
||||
substitute ${./mod-launch-game.sh} $out/lib/openra_2019-${mod.name}/launch-game.sh \
|
||||
--subst-var out \
|
||||
--subst-var-by name ${escapeShellArg mod.name} \
|
||||
--subst-var-by title ${escapeShellArg mod.title} \
|
||||
--subst-var-by assetsError ${escapeShellArg mod.assetsError}
|
||||
chmod +x $out/lib/${pname}/launch-game.sh
|
||||
chmod +x $out/lib/openra_2019-${mod.name}/launch-game.sh
|
||||
|
||||
${wrapLaunchGame "-${mod.name}"}
|
||||
${wrapLaunchGame "_2019-${mod.name}" "openra-${mod.name}"}
|
||||
|
||||
substitute ${./openra-mod.desktop} $(mkdirp $out/share/applications)/${pname}.desktop \
|
||||
--subst-var-by name ${escapeShellArg mod.name} \
|
||||
|
||||
@ -14,36 +14,39 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ util-linux man ] ++ lib.optional enableCgiScripts gd;
|
||||
nativeBuildInputs = [ pkg-config man util-linux ];
|
||||
buildInputs = lib.optional enableCgiScripts gd;
|
||||
|
||||
prePatch = ''
|
||||
sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \
|
||||
-i ./src/apcagent/Makefile ./autoconf/targets.mak
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure
|
||||
'';
|
||||
|
||||
# ./configure ignores --prefix, so we must specify some paths manually
|
||||
# There is no real reason for a bin/sbin split, so just use bin.
|
||||
preConfigure = ''
|
||||
export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown
|
||||
export ac_cv_path_WALL=${wall}/bin/wall
|
||||
sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure
|
||||
export configureFlags="\
|
||||
--bindir=$out/bin \
|
||||
--sbindir=$out/bin \
|
||||
--sysconfdir=$out/etc/apcupsd \
|
||||
--mandir=$out/share/man \
|
||||
--with-halpolicydir=$out/share/halpolicy \
|
||||
--localstatedir=/var/ \
|
||||
--with-nologin=/run \
|
||||
--with-log-dir=/var/log/apcupsd \
|
||||
--with-pwrfail-dir=/run/apcupsd \
|
||||
--with-lock-dir=/run/lock \
|
||||
--with-pid-dir=/run \
|
||||
--enable-usb \
|
||||
${lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"}
|
||||
"
|
||||
'';
|
||||
configureFlags = [
|
||||
"--bindir=${placeholder "out"}/bin"
|
||||
"--sbindir=${placeholder "out"}/bin"
|
||||
"--sysconfdir=${placeholder "out"}/etc/apcupsd"
|
||||
"--mandir=${placeholder "out"}/share/man"
|
||||
"--with-halpolicydir=${placeholder "out"}/share/halpolicy"
|
||||
"--localstatedir=/var"
|
||||
"--with-nologin=/run"
|
||||
"--with-log-dir=/var/log/apcupsd"
|
||||
"--with-pwrfail-dir=/run/apcupsd"
|
||||
"--with-lock-dir=/run/lock"
|
||||
"--with-pid-dir=/run"
|
||||
"--enable-usb"
|
||||
"ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown"
|
||||
"ac_cv_path_WALL=${wall}/bin/wall"
|
||||
] ++ lib.optionals enableCgiScripts [
|
||||
"--enable-cgi"
|
||||
"--with-cgi-bin=${placeholder "out"}/libexec/cgi-bin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for file in "$out"/etc/apcupsd/*; do
|
||||
|
||||
@ -287,6 +287,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tests = {
|
||||
inherit (nixosTests) code-server;
|
||||
};
|
||||
# vscode-with-extensions compatibility
|
||||
executableName = "code-server";
|
||||
longName = "Visual Studio Code Server";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -7,15 +7,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trust-dns";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluejekyll";
|
||||
repo = "trust-dns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b9tK1JbTwB3ZuRPh0wb3cOFj9dMW7URXIaFzUq0Yipw=";
|
||||
sha256 = "sha256-YjwzU/mYKiHL2xB/oczkP/4i5XYIvSNyqDLmmrRQPhM=";
|
||||
};
|
||||
cargoHash = "sha256-mpobdeTRWJzIEmhwtcM6UE66qRD5ot/0yLeQM6Tec+0=";
|
||||
cargoHash = "sha256-uAmszVOlRttmn6b3Rv2Y5ZuP3qBIVjIFJ42BJro+K8s=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "postgres_exporter";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus-community";
|
||||
repo = "postgres_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eY9/a+uFJJ8lT+0ZGa+ExjKf0V6JOqI3l1sZbfQEXOc=";
|
||||
sha256 = "sha256-/IIMtLjOKmkqsNVgqrMo8D8r/NDmg4NRWCEMJTNgLbk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sMWprCRUvF6voLM3GjTq9tId1GoCPac/RE6hXL+LBEE=";
|
||||
|
||||
@ -1,17 +1,25 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "redis_exporter";
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oliver006";
|
||||
repo = "redis_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FP5X+2OFEFUJWtMKbVgcCkNSV3BtQyMVsXGD6dn3mjY=";
|
||||
sha256 = "sha256-NvkAwUrygjys25lcTxtRnrex4+XIK2yzqKkk26f4cmE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Owfxy7WkucQ6BM8yjnZg9/8CgopGTtbQTTUuxoT3RRE=";
|
||||
patches = [
|
||||
# https://github.com/oliver006/redis_exporter/pull/812
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Ma27/redis_exporter/commit/250b2e9febbadef326ca9ae68c372dfaabd53ca9.patch";
|
||||
sha256 = "sha256-G1OIUwlFZ06UWudWvc6v1YFcRz05ji1326nUcd9zYDc=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-S7cEaFBgyvDmsNq+NvqtC8I2SRL/ngXUuNdx6TN/riI=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.BuildVersion=${version}"
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nats-server";
|
||||
version = "2.9.17";
|
||||
version = "2.9.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tWCZq6OwcjVaeaL4CrxSPwGaCKNZ2eN5s3vOoU9oT1I=";
|
||||
hash = "sha256-Eda6i4kJbvX1Wzkwd9YSd3fes3kdkekKKhIt7xH8Yi8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Qn1FkZLo3EC7KX7ZsQLDu26fbMFiwvy7cjlsFlgMtmo=";
|
||||
vendorHash = "sha256-m/15F0BHCAEcNlRf71jJP5bjrrqRgX/CQm8SddpTkYw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pulumi";
|
||||
version = "3.69.0";
|
||||
version = "3.71.0";
|
||||
|
||||
# Used in pulumi-language packages, which inherit this prop
|
||||
sdkVendorHash = "sha256-S8eb2V7ZHhQ0xas+88lwxjL50+22dbyJ0aM60dAtb5k=";
|
||||
@ -23,12 +23,12 @@ buildGoModule rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tjYACGfUqWFAgOvcdPfGyZNxi0qhV6RaNgUgKivteZU=";
|
||||
hash = "sha256-7R44W/AFHddgTGm2FYi0sH4IsFlJkBGeQ7Vu60UjW5U=";
|
||||
# Some tests rely on checkout directory name
|
||||
name = "pulumi";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VVgawsRSjMIYu/+f9MmVQNgL90o8vrj9kzZpKbg8/98=";
|
||||
vendorHash = "sha256-wDg9XObNGIVuMWNG95vq0tjd2cRHauB+QkJ2CjM5E3w=";
|
||||
|
||||
sourceRoot = "${src.name}/pkg";
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest
|
||||
, pytest-cov, pytest-runner, lib, stringcase
|
||||
{ buildPythonApplication, click, fetchPypi, hypothesis, pytest
|
||||
, lib, stringcase
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
@ -11,15 +11,14 @@ buildPythonApplication rec {
|
||||
sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i setup.cfg \
|
||||
-e '/--cov.*/d'
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
mypy
|
||||
pytest
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "krapslog";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acj";
|
||||
repo = "krapslog-rs";
|
||||
rev = version;
|
||||
sha256 = "sha256-zBtoKU9OHo1hyCgyQVAb3fsEW/IHwISht8VAss7LLq4=";
|
||||
sha256 = "sha256-MjFTdEtsgF4URN/gPMEieChWeKQYpJ1c9i4Zh7Bb+ps=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gZr79VmvZrGglF6aC6j2c45ueJytgUslzBT5fyM3/V8=";
|
||||
cargoHash = "sha256-nxjdwp99KVJo7PME27QG66x+CAC91s26ccL0nyXE3Ac=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper
|
||||
{ lib, pkgs, stdenv, fetchFromGitHub, python3, nix, git, makeWrapper
|
||||
, runtimeShell }:
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "nix-pin";
|
||||
@ -10,10 +10,7 @@ let self = stdenv.mkDerivation rec {
|
||||
sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python3 mypy ];
|
||||
checkPhase = ''
|
||||
mypy bin/*
|
||||
'';
|
||||
buildInputs = [ python3 ];
|
||||
installPhase = ''
|
||||
mkdir "$out"
|
||||
cp -r bin share "$out"
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thc-hydra";
|
||||
version = "9.4";
|
||||
version = "9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vanhauser-thc";
|
||||
repo = "thc-hydra";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+UkMJmIUIt/yTGY07Q4nu1zbWQq5chTvMNQSh5U/fTU=";
|
||||
sha256 = "sha256-gdMxdFrBGVHA1ZBNFW89PBXwACnXTGJ/e/Z5+xVV5F0=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ offline ];
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = platforms.darwin; # fails to build since v9.4
|
||||
badPlatforms = platforms.darwin; # fails to build since v9.5
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ugrep";
|
||||
version = "3.11.2";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NDH2OEweIU0/JHfkq0md6cll2uwCTLkVmJcmF337DUw=";
|
||||
hash = "sha256-kpLzv8nHye1XStHABmZHXQ2Gn+g06BFeN3u47bkKbzU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -3322,6 +3322,8 @@ with pkgs;
|
||||
|
||||
codespell = callPackage ../development/tools/codespell { };
|
||||
|
||||
codux = callPackage ../applications/editors/codux { };
|
||||
|
||||
coolreader = libsForQt5.callPackage ../applications/misc/coolreader { };
|
||||
|
||||
corsair = with python3Packages; toPythonApplication corsair-scan;
|
||||
|
||||
@ -2753,6 +2753,8 @@ self: super: with self; {
|
||||
|
||||
django-libsass = callPackage ../development/python-modules/django-libsass { };
|
||||
|
||||
django-leaflet = callPackage ../development/python-modules/django-leaflet { };
|
||||
|
||||
django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { };
|
||||
|
||||
django-login-required-middleware = callPackage ../development/python-modules/django-login-required-middleware { };
|
||||
@ -6162,6 +6164,8 @@ self: super: with self; {
|
||||
|
||||
mediapy = callPackage ../development/python-modules/mediapy { };
|
||||
|
||||
meeko = callPackage ../development/python-modules/meeko { };
|
||||
|
||||
meep = callPackage ../development/python-modules/meep { };
|
||||
|
||||
meilisearch = callPackage ../development/python-modules/meilisearch { };
|
||||
@ -7476,6 +7480,8 @@ self: super: with self; {
|
||||
inherit (pkgs) glibcLocales git;
|
||||
};
|
||||
|
||||
pem = callPackage ../development/python-modules/pem { };
|
||||
|
||||
pendulum = callPackage ../development/python-modules/pendulum { };
|
||||
|
||||
pep440 = callPackage ../development/python-modules/pep440 { };
|
||||
@ -11839,6 +11845,8 @@ self: super: with self; {
|
||||
|
||||
sumtypes = callPackage ../development/python-modules/sumtypes { };
|
||||
|
||||
summarytools = callPackage ../development/python-modules/summarytools { };
|
||||
|
||||
sunpy = callPackage ../development/python-modules/sunpy { };
|
||||
|
||||
sunwatcher = callPackage ../development/python-modules/sunwatcher { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user