Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/archspec/default.nix
This commit is contained in:
Martin Weinelt
commit
0161570089
111
nixos/modules/services/misc/llama-cpp.nix
Normal file
111
nixos/modules/services/misc/llama-cpp.nix
Normal file
@ -0,0 +1,111 @@
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.llama-cpp;
|
||||
in {
|
||||
|
||||
options = {
|
||||
|
||||
services.llama-cpp = {
|
||||
enable = lib.mkEnableOption "LLaMA C++ server";
|
||||
|
||||
package = lib.mkPackageOption pkgs "llama-cpp" { };
|
||||
|
||||
model = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
example = "/models/mistral-instruct-7b/ggml-model-q4_0.gguf";
|
||||
description = "Model path.";
|
||||
};
|
||||
|
||||
extraFlags = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = "Extra flags passed to llama-cpp-server.";
|
||||
example = ["-c" "4096" "-ngl" "32" "--numa"];
|
||||
default = [];
|
||||
};
|
||||
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
example = "0.0.0.0";
|
||||
description = "IP address the LLaMA C++ server listens on.";
|
||||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 8080;
|
||||
description = "Listen port for LLaMA C++ server.";
|
||||
};
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Open ports in the firewall for LLaMA C++ server.";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
systemd.services.llama-cpp = {
|
||||
description = "LLaMA C++ server";
|
||||
after = ["network.target"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "idle";
|
||||
KillSignal = "SIGINT";
|
||||
ExecStart = "${cfg.package}/bin/llama-cpp-server --log-disable --host ${cfg.host} --port ${builtins.toString cfg.port} -m ${cfg.model} ${utils.escapeSystemdExecArgs cfg.extraFlags}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 300;
|
||||
|
||||
# for GPU acceleration
|
||||
PrivateDevices = false;
|
||||
|
||||
# hardening
|
||||
DynamicUser = true;
|
||||
CapabilityBoundingSet = "";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
NoNewPrivileges = true;
|
||||
PrivateMounts = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectSystem = "strict";
|
||||
MemoryDenyWriteExecute = true;
|
||||
LockPersonality = true;
|
||||
RemoveIPC = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
ProtectProc = "invisible";
|
||||
ProtectHostname = true;
|
||||
ProcSubset = "pid";
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall = lib.mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ cfg.port ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ newam ];
|
||||
}
|
||||
@ -95,7 +95,6 @@ in
|
||||
ipv6 = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
defaultText = literalExpression "config.networking.enableIPv6";
|
||||
description = lib.mdDoc "Whether to use IPv6.";
|
||||
};
|
||||
|
||||
|
||||
68
nixos/modules/services/networking/dnsmasq.md
Normal file
68
nixos/modules/services/networking/dnsmasq.md
Normal file
@ -0,0 +1,68 @@
|
||||
# Dnsmasq {#module-services-networking-dnsmasq}
|
||||
|
||||
Dnsmasq is an integrated DNS, DHCP and TFTP server for small networks.
|
||||
|
||||
## Configuration {#module-services-networking-dnsmasq-configuration}
|
||||
|
||||
### An authoritative DHCP and DNS server on a home network {#module-services-networking-dnsmasq-configuration-home}
|
||||
|
||||
On a home network, you can use Dnsmasq as a DHCP and DNS server. New devices on
|
||||
your network will be configured by Dnsmasq, and instructed to use it as the DNS
|
||||
server by default. This allows you to rely on your own server to perform DNS
|
||||
queries and caching, with DNSSEC enabled.
|
||||
|
||||
The following example assumes that
|
||||
|
||||
- you have disabled your router's integrated DHCP server, if it has one
|
||||
- your router's address is set in [](#opt-networking.defaultGateway.address)
|
||||
- your system's Ethernet interface is `eth0`
|
||||
- you have configured the address(es) to forward DNS queries in [](#opt-networking.nameservers)
|
||||
|
||||
```nix
|
||||
{
|
||||
services.dnsmasq = {
|
||||
enable = true;
|
||||
settings = {
|
||||
interface = "eth0";
|
||||
bind-interfaces = true; # Only bind to the specified interface
|
||||
dhcp-authoritative = true; # Should be set when dnsmasq is definitely the only DHCP server on a network
|
||||
|
||||
server = config.networking.nameservers; # Upstream dns servers to which requests should be forwarded
|
||||
|
||||
dhcp-host = [
|
||||
# Give the current system a fixed address of 192.168.0.254
|
||||
"dc:a6:32:0b:ea:b9,192.168.0.254,${config.networking.hostName},infinite"
|
||||
];
|
||||
|
||||
dhcp-option = [
|
||||
# Address of the gateway, i.e. your router
|
||||
"option:router,${config.networking.defaultGateway.address}"
|
||||
];
|
||||
|
||||
dhcp-range = [
|
||||
# Range of IPv4 addresses to give out
|
||||
# <range start>,<range end>,<lease time>
|
||||
"192.168.0.10,192.168.0.253,24h"
|
||||
# Enable stateless IPv6 allocation
|
||||
"::f,::ff,constructor:eth0,ra-stateless"
|
||||
];
|
||||
|
||||
dhcp-rapid-commit = true; # Faster DHCP negotiation for IPv6
|
||||
local-service = true; # Accept DNS queries only from hosts whose address is on a local subnet
|
||||
log-queries = true; # Log results of all DNS queries
|
||||
bogus-priv = true; # Don't forward requests for the local address ranges (192.168.x.x etc) to upstream nameservers
|
||||
domain-needed = true; # Don't forward requests without dots or domain parts to upstream nameservers
|
||||
|
||||
dnssec = true; # Enable DNSSEC
|
||||
# DNSSEC trust anchor. Source: https://data.iana.org/root-anchors/root-anchors.xml
|
||||
trust-anchor = ".,20326,8,2,E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D";
|
||||
};
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
## References {#module-services-networking-dnsmasq-references}
|
||||
|
||||
- Upstream website: <https://dnsmasq.org>
|
||||
- Manpage: <https://dnsmasq.org/docs/dnsmasq-man.html>
|
||||
- FAQ: <https://dnsmasq.org/docs/FAQ>
|
||||
@ -181,4 +181,6 @@ in
|
||||
restartTriggers = [ config.environment.etc.hosts.source ];
|
||||
};
|
||||
};
|
||||
|
||||
meta.doc = ./dnsmasq.md;
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
|
||||
bitstring
|
||||
cryptography
|
||||
dnspython
|
||||
groestlcoin_hash
|
||||
groestlcoin-hash
|
||||
jsonrpclib-pelix
|
||||
matplotlib
|
||||
pbkdf2
|
||||
|
||||
@ -45,13 +45,13 @@
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "visidata";
|
||||
version = "2.11.1";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saulpw";
|
||||
repo = "visidata";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A8iYFdW30Em5pjGn3DRpaV0A7ixwfSzmIp8AgtPkBCI=";
|
||||
hash = "sha256-LALWQu7BgMbAEyOXUE3p6bXhdx8h6jPEvjs/TEtf/wU==";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -70,6 +70,7 @@ buildPythonApplication rec {
|
||||
pyshp
|
||||
#mapbox-vector-tile
|
||||
pypng
|
||||
#pyconll
|
||||
fonttools
|
||||
#sas7bdat
|
||||
#xport
|
||||
@ -114,11 +115,16 @@ buildPythonApplication rec {
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# disable some tests which require access to the network
|
||||
rm -f tests/load-http.vd # http
|
||||
rm -f tests/graph-cursor-nosave.vd # http
|
||||
rm -f tests/messenger-nosave.vd # dns
|
||||
|
||||
# tests to disable because we don't have a package to load such files
|
||||
rm -f tests/load-conllu.vdj # no 'pyconll'
|
||||
rm -f tests/load-sav.vd # no 'savReaderWriter'
|
||||
|
||||
# tests use git to compare outputs to references
|
||||
git init -b "test-reference"
|
||||
git config user.name "nobody"
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
, dbusSupport ? true
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
pname = "baresip";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "baresip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A1S8pen0aPd3CmeRpttwivhwHnAv7Rk2lao8I/CWvo0=";
|
||||
hash = "sha256-7QqaKK8zalyopn9+MkKmdt9XaCkDFBNiXwVd2iXmqMA=";
|
||||
};
|
||||
prePatch = lib.optionalString (!dbusSupport) ''
|
||||
substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -4,17 +4,18 @@
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, Cocoa
|
||||
, pkgsBuildHost
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gurk-rs";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boxdot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LN54XUu+54yGVCbi7ZwY22KOnfS67liioI4JeR3l92I=";
|
||||
sha256 = "sha256-UTjTXUc0W+vlO77ilveAy0HWF5KSKbDnrg5ewTyuTdA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -24,10 +25,11 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"curve25519-dalek-3.2.1" = "sha256-T/NGZddFQWq32eRu6FYfgdPqU8Y4Shi1NpMaX4GeQ54=";
|
||||
"libsignal-protocol-0.1.0" = "sha256-gapAurbs/BdsfPlVvWWF7Ai1nXZcxCW8qc5gQdbnthM=";
|
||||
"libsignal-service-0.1.0" = "sha256-C1Lhi/NRWyPT7omlAdjK7gVTLxmZjZVuZgmZ8dn/D3Y=";
|
||||
"presage-0.5.0-dev" = "sha256-OtRrPcH4/o6Sq/day1WU6R8QgQ2xWkespkfFPqFeKWk=";
|
||||
"libsignal-protocol-0.1.0" = "sha256-FCrJO7porlY5FrwZ2c67UPd4tgN7cH2/3DTwfPjihwM=";
|
||||
"libsignal-service-0.1.0" = "sha256-OWLtaxldKgYPP/aJuWezNkNN0990l3RtDWK38R1fL90=";
|
||||
"curve25519-dalek-4.0.0" = "sha256-KUXvYXeVvJEQ/+dydKzXWCZmA2bFa2IosDzaBL6/Si0=";
|
||||
"presage-0.6.0-dev" = "sha256-65YhxMAAFsnOprBWiB0uH/R9iITt+EYn+kMVjAwTgOQ=";
|
||||
"qr2term-0.3.1" = "sha256-U8YLouVZTtDwsvzZiO6YB4Pe75RXGkZXOxHCQcCOyT8=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -37,7 +39,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ];
|
||||
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
PROTOC = "${pkgsBuildHost.protobuf}/bin/protoc";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Signal Messenger client for terminal";
|
||||
|
||||
@ -8,17 +8,17 @@
|
||||
let
|
||||
|
||||
pname = "mattermost-desktop";
|
||||
version = "5.5.0";
|
||||
version = "5.5.1";
|
||||
|
||||
srcs = {
|
||||
"x86_64-linux" = {
|
||||
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-htjKGO16Qs1RVE4U47DdN8bNpUH4JD/LkMOeoIRmLPI=";
|
||||
hash = "sha256-bRiO5gYM7nrnkbHBP3B9zAK2YV5POkc3stEsbZJ48VA=";
|
||||
};
|
||||
|
||||
"aarch64-linux" = {
|
||||
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz";
|
||||
hash = "sha256-LQhMSIrWDZTXBnJfLKph5e6txHGvQSqEu+P1j1zOiTg=";
|
||||
hash = "sha256-Z4U6Jbwasra69QPHJ9/7WwMSxh0O9r4QIe/xC3WRf4w=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ let
|
||||
pillow
|
||||
rencode
|
||||
six
|
||||
zope_interface
|
||||
zope-interface
|
||||
dbus-python
|
||||
pycairo
|
||||
librsvg
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool
|
||||
, gtk2, halibut, ncurses, perl, darwin
|
||||
{ stdenv, lib, fetchurl, cmake, perl, pkg-config
|
||||
, gtk3, ncurses, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.76";
|
||||
version = "0.80";
|
||||
pname = "putty";
|
||||
|
||||
src = fetchurl {
|
||||
@ -11,33 +11,12 @@ stdenv.mkDerivation rec {
|
||||
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l";
|
||||
hash = "sha256-IBPIOnIbF1NSnpCQ98ODDo/kyAoHDMznZFObrbP2cIE=";
|
||||
};
|
||||
|
||||
# glib-2.62 deprecations
|
||||
env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
|
||||
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
|
||||
perl mkfiles.pl
|
||||
( cd doc ; make );
|
||||
./mkauto.sh
|
||||
cd unix
|
||||
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
|
||||
cd windows
|
||||
'';
|
||||
|
||||
TOOLPATH = stdenv.cc.targetPrefix;
|
||||
makefile = if stdenv.hostPlatform.isWindows then "Makefile.mgw" else null;
|
||||
|
||||
installPhase = if stdenv.hostPlatform.isWindows then ''
|
||||
for exe in *.exe; do
|
||||
install -D $exe $out/bin/$exe
|
||||
done
|
||||
'' else null;
|
||||
|
||||
nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ];
|
||||
nativeBuildInputs = [ cmake perl pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
|
||||
gtk2 ncurses
|
||||
gtk3 ncurses
|
||||
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foliate";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnfactotum";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ksjd/H62c9dhoOXQtrKqexAjLMGd/adP/fL78fYRi/Y=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6cymAqQxHHoTgzEyUKXC7zV/lUEJfIG+54+tLsc9iHo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple and modern GTK eBook reader";
|
||||
homepage = "https://johnfactotum.github.io/foliate/";
|
||||
homepage = "https://johnfactotum.github.io/foliate";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
|
||||
@ -211,7 +211,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
whitenoise
|
||||
whoosh
|
||||
zipp
|
||||
zope_interface
|
||||
zope-interface
|
||||
zxing-cpp
|
||||
]
|
||||
++ redis.optional-dependencies.hiredis
|
||||
|
||||
@ -79,7 +79,7 @@ let
|
||||
"zope.interface"
|
||||
"node_three"
|
||||
] [
|
||||
"zope_interface"
|
||||
"zope-interface"
|
||||
"threejs"
|
||||
];
|
||||
# spkg names (this_is_a_package-version) of all transitive deps
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sioclient";
|
||||
version = "unstable-2023-02-13";
|
||||
version = "3.1.0-unstable-2023-11-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "socketio";
|
||||
repo = "socket.io-client-cpp";
|
||||
rev = "b10474e3eaa6b27e75dbc1382ac9af74fdf3fa85";
|
||||
hash = "sha256-bkuFA6AvZvBpnO6Lixqx8Ux5Dy5NHWGB2y1VF7allC0=";
|
||||
rev = "0dc2f7afea17a0e5bfb5e9b1e6d6f26ab1455cef";
|
||||
hash = "sha256-iUKWDv/CS2e68cCSM0QUobkfz2A8ZjJ7S0zw7rowQJ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -1,22 +1,14 @@
|
||||
{ fetchurl, fetchpatch, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20201230";
|
||||
version = "20231119";
|
||||
pname = "libewf";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
|
||||
hash = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc=";
|
||||
hash = "sha256-7AjUEaXasOzJV9ErZK2a4HMTaqhcBbLKd8M+A5SbKrc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with OpenSSL 3.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libyal/libewf/commit/033ea5b4e5f8f1248f74a2ec61fc1be183c6c46b.patch";
|
||||
hash = "sha256-R4+NO/91kiZP48SJyVF9oYjKCg1h/9Kh8/0VOEmJXPQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ zlib openssl libuuid ]
|
||||
++ lib.optionals stdenv.isDarwin [ bzip2 ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "archspec";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
owner = "archspec";
|
||||
repo = "archspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-6+1TiXCBqW8YH/ggZhRcZV/Tyh8Ku3ocwxf9z9KrCZY=";
|
||||
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for detecting, labeling, and reasoning about microarchitectures";
|
||||
homepage = "https://archspec.readthedocs.io/";
|
||||
changelog = "https://github.com/archspec/archspec/releases/tag/v0.2.1";
|
||||
changelog = "https://github.com/archspec/archspec/releases/tag/v${version}";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ atila ];
|
||||
};
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
# , xbr
|
||||
, yapf
|
||||
# , zlmdb
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}@args:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -99,7 +99,7 @@ buildPythonPackage rec {
|
||||
nvx = [ cffi ];
|
||||
scram = [ argon2-cffi cffi passlib ];
|
||||
serialization = [ cbor2 flatbuffers msgpack ujson py-ubjson ];
|
||||
twisted = [ attrs args.twisted zope_interface ];
|
||||
twisted = [ attrs args.twisted zope-interface ];
|
||||
ui = [ pygobject3 ];
|
||||
xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc /* py-eth-sig-utils */ py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ];
|
||||
};
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, persistent
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, transaction
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
, python
|
||||
, pythonOlder
|
||||
}:
|
||||
@ -24,12 +24,12 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
persistent
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
transaction
|
||||
zope_testrunner
|
||||
zope-testrunner
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
, requests
|
||||
, six
|
||||
, zope-component
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, setuptools
|
||||
, dialog
|
||||
, gnureadline
|
||||
@ -53,7 +53,7 @@ buildPythonPackage rec {
|
||||
requests
|
||||
six
|
||||
zope-component
|
||||
zope_interface
|
||||
zope-interface
|
||||
setuptools # for pkg_resources
|
||||
];
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytz
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytz
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@ -37,4 +37,3 @@ buildPythonPackage rec {
|
||||
maintainers = with maintainers; [ icyrockcom ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hhlwXvP/XqZfFFXo1yPK4TdKUECZXfKCWhCcGotyDCk=";
|
||||
hash = "sha256-P3N9wCmua0kS9vli+QUjJPZSeQXO9t8m1Ei+CeN2tEU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, zope-testing
|
||||
}:
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
sha256 = "a094ed7961a3dd38fcaaa69cf7a58670038acdff186360166d9e3d964b7a7323";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface zope-testing ];
|
||||
propagatedBuildInputs = [ zope-interface zope-testing ];
|
||||
|
||||
# tests fail, see https://hydra.nixos.org/build/4316603/log/raw
|
||||
doCheck = false;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, setuptools
|
||||
, six
|
||||
, testtools
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
pyrsistent
|
||||
setuptools
|
||||
six
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ buildPythonPackage, fetchPypi, atpublic, zope_interface, nose2 }:
|
||||
{ buildPythonPackage, fetchPypi, atpublic, zope-interface, nose2 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flufl.bounce";
|
||||
version = "4.0";
|
||||
|
||||
buildInputs = [ nose2 ];
|
||||
propagatedBuildInputs = [ atpublic zope_interface ];
|
||||
propagatedBuildInputs = [ atpublic zope-interface ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
, importlib-metadata
|
||||
, setuptools
|
||||
, wheel
|
||||
, zope_event
|
||||
, zope_interface
|
||||
, zope-event
|
||||
, zope-interface
|
||||
, pythonOlder
|
||||
|
||||
# for passthru.tests
|
||||
@ -47,8 +47,8 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
importlib-metadata
|
||||
zope_event
|
||||
zope_interface
|
||||
zope-event
|
||||
zope-interface
|
||||
] ++ lib.optionals (!isPyPy) [
|
||||
greenlet
|
||||
];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, zope_testrunner, six, chardet}:
|
||||
, zope-testrunner, six, chardet}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ghdiff";
|
||||
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
||||
sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ zope_testrunner ];
|
||||
nativeCheckInputs = [ zope-testrunner ];
|
||||
propagatedBuildInputs = [ six chardet ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -10,20 +10,25 @@
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.16.0";
|
||||
format = "setuptools";
|
||||
version = "3.17.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cD5BQ5Ykj6mEdLurnqli9MlqPK8RhMkDv8lFPSdLDqI=";
|
||||
hash = "sha256-xaKBfkgmhB7MH1qFWu9hjHIIVG1BjBgzjfnyD14V9Z0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
@ -44,8 +49,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google Cloud Data Catalog API API client library";
|
||||
homepage = "https://github.com/googleapis/python-datacatalog";
|
||||
changelog = "https://github.com/googleapis/python-datacatalog/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-v${version}/packages/google-cloud-datacatalog/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -4,12 +4,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "groestlcoin_hash";
|
||||
pname = "groestlcoin-hash";
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "groestlcoin_hash";
|
||||
inherit version;
|
||||
sha256 = "31a8f6fa4c19db5258c3c73c071b71702102c815ba862b6015d9e4b75ece231e";
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
, tubes
|
||||
, twisted
|
||||
, werkzeug
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
|
||||
# tests
|
||||
, idna
|
||||
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
twisted
|
||||
tubes
|
||||
werkzeug
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, lazr-delegates
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lazr-delegates
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, pyparsing
|
||||
, service-identity
|
||||
, six
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, pythonOlder
|
||||
, python
|
||||
}:
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
pyparsing
|
||||
six
|
||||
twisted
|
||||
zope_interface
|
||||
zope-interface
|
||||
] ++ twisted.optional-dependencies.tls;
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -12,18 +12,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "omnikinverter";
|
||||
version = "0.9.1";
|
||||
format = "pyproject";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-omnikinverter";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Vjfnwk9iIe5j+s/zJHQ2X095Eexp/aKtIi/k0sK45q0=";
|
||||
hash = "sha256-W9VeRhsCXLLgOgvJcNNCGNmPvakPtKHAtwQAGtYJbcY=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
postPatch = ''
|
||||
# Upstream doesn't set a version for the pyproject.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "0.0.0" "${version}" \
|
||||
--replace "--cov" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -39,13 +48,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream doesn't set a version for the pyproject.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "0.0.0" "${version}" \
|
||||
--replace "--cov" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"omnikinverter"
|
||||
];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, cffi
|
||||
, fetchPypi
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, sphinx
|
||||
, manuel
|
||||
, pythonOlder
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zope_interface
|
||||
zope-interface
|
||||
cffi
|
||||
];
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, pythonOlder
|
||||
, sphinxHook
|
||||
, sphinx-rtd-theme
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
sphinxHook
|
||||
sphinx-rtd-theme
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
passthru.optional-dependencies.crypto = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, pyramid
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
chameleon
|
||||
pyramid
|
||||
setuptools
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, venusian
|
||||
, webob
|
||||
, zope-deprecation
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
venusian
|
||||
webob
|
||||
zope-deprecation
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, isPy3k, buildPythonPackage, fetchFromGitHub, zope_interface, twisted }:
|
||||
{ stdenv, lib, isPy3k, buildPythonPackage, fetchFromGitHub, zope-interface, twisted }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python3-application";
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface twisted ];
|
||||
propagatedBuildInputs = [ zope-interface twisted ];
|
||||
|
||||
pythonImportsCheck = [ "application" ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, zope_interface, twisted, greenlet }:
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, zope-interface, twisted, greenlet }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python3-eventlib";
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface twisted greenlet ];
|
||||
propagatedBuildInputs = [ zope-interface twisted greenlet ];
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
, zope_interface
|
||||
, zope_testrunner
|
||||
, zope-interface
|
||||
, zope-testrunner
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
@ -27,13 +27,13 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zope_interface
|
||||
zope-interface
|
||||
sphinx
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
zope_testrunner
|
||||
zope-testrunner
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, webob
|
||||
, pytestCheckHook
|
||||
}:
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ zope_interface webob ];
|
||||
propagatedBuildInputs = [ zope-interface webob ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
, tldextract
|
||||
, twisted
|
||||
, w3lib
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -75,7 +75,7 @@ buildPythonPackage rec {
|
||||
tldextract
|
||||
twisted
|
||||
w3lib
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zope_interface
|
||||
zope-interface
|
||||
mock
|
||||
];
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
, hyperlink
|
||||
, incremental
|
||||
, typing-extensions
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
|
||||
# optional-dependencies
|
||||
, appdirs
|
||||
@ -89,7 +89,7 @@ buildPythonPackage rec {
|
||||
hyperlink
|
||||
incremental
|
||||
typing-extensions
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, twisted
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
twisted
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
, pythonOlder
|
||||
, service-identity
|
||||
, twisted
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
incremental
|
||||
twisted
|
||||
automat
|
||||
zope_interface
|
||||
zope-interface
|
||||
] ++ twisted.optional-dependencies.tls;
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, fetchPypi
|
||||
, python
|
||||
, zc-buildout
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ zc-buildout ];
|
||||
|
||||
nativeCheckInputs = [ zope_testrunner ];
|
||||
nativeCheckInputs = [ zope-testrunner ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m zope.testrunner --test-path=src []
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
, manuel
|
||||
, docutils
|
||||
, pygments
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
|
||||
|
||||
buildInputs = [ manuel docutils ];
|
||||
propagatedBuildInputs = [ zope_testrunner ];
|
||||
propagatedBuildInputs = [ zope-testrunner ];
|
||||
nativeCheckInputs = [ pygments ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
, transaction
|
||||
, six
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, zodbpickle
|
||||
, zconfig
|
||||
, persistent
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
transaction
|
||||
six
|
||||
zope_interface
|
||||
zope-interface
|
||||
zodbpickle
|
||||
zconfig
|
||||
persistent
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
manuel
|
||||
zope_testrunner
|
||||
zope-testrunner
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
, zope-configuration
|
||||
, zope-deferredimport
|
||||
, zope-deprecation
|
||||
, zope_event
|
||||
, zope-event
|
||||
, zope-hookable
|
||||
, zope-i18nmessageid
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -25,13 +25,13 @@ buildPythonPackage rec {
|
||||
zope-configuration
|
||||
zope-deferredimport
|
||||
zope-deprecation
|
||||
zope_event
|
||||
zope-event
|
||||
zope-hookable
|
||||
zope-i18nmessageid
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
# ignore tests because of a circular dependency on zope_security
|
||||
# ignore tests because of a circular dependency on zope-security
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, zope-i18nmessageid
|
||||
, zope_interface
|
||||
, zope_schema
|
||||
, zope-interface
|
||||
, zope-schema
|
||||
, pytestCheckHook
|
||||
, zope-testing
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
, manuel
|
||||
}:
|
||||
|
||||
@ -33,13 +33,13 @@ buildPythonPackage rec {
|
||||
manuel
|
||||
pytestCheckHook
|
||||
zope-testing
|
||||
zope_testrunner
|
||||
zope-testrunner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zope-i18nmessageid
|
||||
zope_interface
|
||||
zope_schema
|
||||
zope-interface
|
||||
zope-schema
|
||||
];
|
||||
|
||||
# Need to investigate how to run the tests with zope-testrunner
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
zope_testrunner
|
||||
zope-testrunner
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, zope_interface
|
||||
, zope_location
|
||||
, zope_schema
|
||||
, zope-interface
|
||||
, zope-location
|
||||
, zope-schema
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
@ -18,10 +18,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface ];
|
||||
propagatedBuildInputs = [ zope-interface ];
|
||||
|
||||
doCheck = !isPy27; # namespace conflicts
|
||||
nativeCheckInputs = [ unittestCheckHook zope_location zope_schema ];
|
||||
nativeCheckInputs = [ unittestCheckHook zope-location zope-schema ];
|
||||
|
||||
unittestFlagsArray = [ "-s" "src/zope/copy" ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope-proxy
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ zope-proxy ];
|
||||
|
||||
nativeCheckInputs = [ zope_testrunner ];
|
||||
nativeCheckInputs = [ zope-testrunner ];
|
||||
|
||||
checkPhase = ''
|
||||
zope-testrunner --test-path=src []
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ zope_interface ];
|
||||
propagatedBuildInputs = [ zope-interface ];
|
||||
|
||||
# circular deps
|
||||
doCheck = false;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope_schema
|
||||
, zope_interface
|
||||
, zope-schema
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface zope_schema ];
|
||||
propagatedBuildInputs = [ zope-interface zope-schema ];
|
||||
|
||||
checkPhase = ''
|
||||
cd src/zope/filerepresentation && python -m unittest
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
zope_testrunner
|
||||
zope-testrunner
|
||||
];
|
||||
|
||||
unittestFlagsArray = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope_event
|
||||
, zope-event
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_event ];
|
||||
propagatedBuildInputs = [ zope-event ];
|
||||
|
||||
doCheck = false; # Circular deps.
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, zope_event
|
||||
, zope_interface
|
||||
, zope-event
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ zope_event zope_interface ];
|
||||
propagatedBuildInputs = [ zope-event zope-interface ];
|
||||
|
||||
# namespace colides with local directory
|
||||
doCheck = false;
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ zope-proxy ];
|
||||
|
||||
# ignore circular dependency on zope_schema
|
||||
# ignore circular dependency on zope-schema
|
||||
preBuild = ''
|
||||
sed -i '/zope.schema/d' setup.py
|
||||
'';
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ zope_interface ];
|
||||
propagatedBuildInputs = [ zope-interface ];
|
||||
|
||||
# circular deps
|
||||
doCheck = false;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope_location
|
||||
, zope_event
|
||||
, zope_interface
|
||||
, zope-location
|
||||
, zope-event
|
||||
, zope-interface
|
||||
, zope-testing
|
||||
}:
|
||||
|
||||
@ -16,10 +16,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_location zope_event zope_interface zope-testing ];
|
||||
propagatedBuildInputs = [ zope-location zope-event zope-interface zope-testing ];
|
||||
|
||||
# ImportError: No module named 'zope.event'
|
||||
# even though zope_event has been included.
|
||||
# even though zope-event has been included.
|
||||
# Package seems to work fine.
|
||||
doCheck = false;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope-i18nmessageid
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope-i18nmessageid zope_interface ];
|
||||
propagatedBuildInputs = [ zope-i18nmessageid zope-interface ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/zopefoundation/zope.size";
|
||||
@ -2,8 +2,8 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, zope_interface
|
||||
, zope_schema
|
||||
, zope-interface
|
||||
, zope-schema
|
||||
, zope-cachedescriptors
|
||||
, pytz
|
||||
, webtest
|
||||
@ -13,7 +13,7 @@
|
||||
, six
|
||||
, mock
|
||||
, zope-testing
|
||||
, zope_testrunner
|
||||
, zope-testrunner
|
||||
, python
|
||||
}:
|
||||
|
||||
@ -37,8 +37,8 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
zope_interface
|
||||
zope_schema
|
||||
zope-interface
|
||||
zope-schema
|
||||
zope-cachedescriptors
|
||||
pytz
|
||||
webtest
|
||||
@ -51,7 +51,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
zope-testing
|
||||
zope_testrunner
|
||||
zope-testrunner
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, zope-exceptions
|
||||
, zope-testing
|
||||
, six
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface zope-exceptions zope-testing six ];
|
||||
propagatedBuildInputs = [ zope-interface zope-exceptions zope-testing six ];
|
||||
|
||||
doCheck = false; # custom test modifies sys.path
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, twisted
|
||||
, jinja2
|
||||
, msgpack
|
||||
, zope_interface
|
||||
, zope-interface
|
||||
, sqlalchemy
|
||||
, alembic
|
||||
, python-dateutil
|
||||
@ -85,7 +85,7 @@ let
|
||||
twisted
|
||||
jinja2
|
||||
msgpack
|
||||
zope_interface
|
||||
zope-interface
|
||||
sqlalchemy
|
||||
alembic
|
||||
python-dateutil
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20231120.08365fb";
|
||||
version = "20240103.7a93ae5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
|
||||
hash = "sha256-V4OHkF0i3dnvRXmo2UKItibr4Dr8vG1CX2L2/9mL7p4=";
|
||||
hash = "sha256-1pTruSF+Kl1wqTFIaYYHrvbD9p+k+1PGa5PpV4jvgEk=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vcmi";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vcmi";
|
||||
repo = "vcmi";
|
||||
rev = version;
|
||||
hash = "sha256-5G6qmn2b1/0h7aGNNx4t38Akzg2bZFKubOp3FLqSi+I=";
|
||||
hash = "sha256-C8WzEidTanWKPI/J2bEsi7sTMhn+FmykC55EsXZLLQ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -122,7 +122,7 @@ with python.pkgs; buildPythonApplication rec {
|
||||
pytest-django
|
||||
pytest-unordered
|
||||
responses
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
fixupPhase = ''
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
mailman
|
||||
requests
|
||||
zope_interface
|
||||
zope-interface
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -40,6 +40,9 @@ stdenv.mkDerivation {
|
||||
postPatch = ''
|
||||
substituteInPlace postlicyd/policy_tokens.sh \
|
||||
--replace /bin/bash ${bash}/bin/bash;
|
||||
|
||||
substituteInPlace postlicyd/*_tokens.sh \
|
||||
--replace "unsigned int" "size_t"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare -Wno-error=format-truncation";
|
||||
|
||||
@ -67,6 +67,7 @@ in rec {
|
||||
|
||||
unifi7 = generic {
|
||||
version = "7.5.187";
|
||||
suffix = "-f57f5bf7ab";
|
||||
sha256 = "sha256-a5kl8gZbRnhS/p1imPl7soM0/QSFHdM0+2bNmDfc1mY=";
|
||||
};
|
||||
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
in
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "04.02.07";
|
||||
version = "04.02.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||
sha256 = "sha256-A+EtkNmQOcz3Mb4q7qQGNL6pyCnRus4nqNor485tsZA=";
|
||||
sha256 = "sha256-GBuX5sQbY7oXcm8QTlWXcX6lrwgqQRF1UTBZ3zPTChU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = tclLibraries;
|
||||
|
||||
@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec {
|
||||
appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future
|
||||
html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark
|
||||
service-identity simplejson sphinx-rtd-theme testtools treq twisted zfec
|
||||
zope_interface
|
||||
zope-interface
|
||||
] ++ twisted.optional-dependencies.tls
|
||||
++ twisted.optional-dependencies.conch;
|
||||
|
||||
|
||||
@ -25005,8 +25005,6 @@ with pkgs;
|
||||
|
||||
simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };
|
||||
|
||||
sioclient = callPackage ../development/libraries/sioclient { };
|
||||
|
||||
sfml = callPackage ../development/libraries/sfml {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
|
||||
};
|
||||
@ -26858,9 +26856,8 @@ with pkgs;
|
||||
|
||||
rspamd = callPackage ../servers/mail/rspamd { };
|
||||
|
||||
pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix {
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
|
||||
|
||||
pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { };
|
||||
|
||||
pomerium = callPackage ../servers/http/pomerium { };
|
||||
@ -40884,7 +40881,7 @@ with pkgs;
|
||||
pwntools = with python3Packages; toPythonApplication pwntools;
|
||||
|
||||
putty = callPackage ../applications/networking/remote/putty {
|
||||
gtk2 = gtk2-x11;
|
||||
gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
|
||||
};
|
||||
|
||||
qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
|
||||
|
||||
@ -187,6 +187,7 @@ mapAliases ({
|
||||
graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10
|
||||
graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09
|
||||
grappelli_safe = grappelli-safe; # added 2023-10-08
|
||||
groestlcoin_hash = groestlcoin-hash; # added 2024-01-06
|
||||
grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
|
||||
guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16
|
||||
ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
|
||||
@ -494,12 +495,20 @@ mapAliases ({
|
||||
zope_component = zope-component; # added 2023-07-28
|
||||
zope_configuration = zope-configuration; # added 2023-11-12
|
||||
zope_contenttype = zope-contenttype; # added 2023-10-11
|
||||
zope_copy = zope-copy; # added 2024-01-06
|
||||
zope_deprecation = zope-deprecation; # added 2023-10-07
|
||||
zope_dottedname = zope-dottedname; # added 2023-11-12
|
||||
zope_event = zope-event; # added 2024-01-06
|
||||
zope_exceptions = zope-exceptions; # added 2023-10-11
|
||||
zope_filerepresentation = zope-filerepresentation; # added 2024-01-06
|
||||
zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
|
||||
zope_interface = zope-interface; # added 2024-01-06
|
||||
zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
|
||||
zope_location = zope-location; # added 2024-01-06
|
||||
zope_proxy = zope-proxy; # added 2023-10-07
|
||||
zope_schema = zope-schema; # added 2024-01-06
|
||||
zope_size = zope-size; # added 2024-01-06
|
||||
zope_testing = zope-testing; # added 2023-11-12
|
||||
zope_testrunner = zope-testrunner; # added 2024-01-06
|
||||
zxing_cpp = zxing-cpp; # added 2023-11-05
|
||||
})
|
||||
|
||||
@ -4912,7 +4912,7 @@ self: super: with self; {
|
||||
|
||||
grip = callPackage ../development/python-modules/grip { };
|
||||
|
||||
groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { };
|
||||
groestlcoin-hash = callPackage ../development/python-modules/groestlcoin-hash { };
|
||||
|
||||
grpc-google-iam-v1 = callPackage ../development/python-modules/grpc-google-iam-v1 { };
|
||||
|
||||
@ -16464,7 +16464,7 @@ self: super: with self; {
|
||||
|
||||
zope-contenttype = callPackage ../development/python-modules/zope-contenttype { };
|
||||
|
||||
zope_copy = callPackage ../development/python-modules/zope_copy { };
|
||||
zope-copy = callPackage ../development/python-modules/zope-copy { };
|
||||
|
||||
zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { };
|
||||
|
||||
@ -16472,33 +16472,33 @@ self: super: with self; {
|
||||
|
||||
zope-dottedname = callPackage ../development/python-modules/zope-dottedname { };
|
||||
|
||||
zope_event = callPackage ../development/python-modules/zope_event { };
|
||||
zope-event = callPackage ../development/python-modules/zope-event { };
|
||||
|
||||
zope-exceptions = callPackage ../development/python-modules/zope-exceptions { };
|
||||
|
||||
zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { };
|
||||
zope-filerepresentation = callPackage ../development/python-modules/zope-filerepresentation { };
|
||||
|
||||
zope-hookable = callPackage ../development/python-modules/zope-hookable { };
|
||||
|
||||
zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { };
|
||||
|
||||
zope_interface = callPackage ../development/python-modules/zope_interface { };
|
||||
zope-interface = callPackage ../development/python-modules/zope-interface { };
|
||||
|
||||
zope-lifecycleevent = callPackage ../development/python-modules/zope-lifecycleevent { };
|
||||
|
||||
zope_location = callPackage ../development/python-modules/zope_location { };
|
||||
zope-location = callPackage ../development/python-modules/zope-location { };
|
||||
|
||||
zope-proxy = callPackage ../development/python-modules/zope-proxy { };
|
||||
|
||||
zope_schema = callPackage ../development/python-modules/zope_schema { };
|
||||
zope-schema = callPackage ../development/python-modules/zope-schema { };
|
||||
|
||||
zope_size = callPackage ../development/python-modules/zope_size { };
|
||||
zope-size = callPackage ../development/python-modules/zope-size { };
|
||||
|
||||
zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { };
|
||||
|
||||
zope-testing = callPackage ../development/python-modules/zope-testing { };
|
||||
|
||||
zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
|
||||
zope-testrunner = callPackage ../development/python-modules/zope-testrunner { };
|
||||
|
||||
zopfli = callPackage ../development/python-modules/zopfli {
|
||||
inherit (pkgs) zopfli;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user