Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d7c25ce768
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
let
|
||||
cfg = config.services.nextcloud.notify_push;
|
||||
cfgN = config.services.nextcloud;
|
||||
in
|
||||
{
|
||||
options.services.nextcloud.notify_push = {
|
||||
|
|
@ -25,6 +26,16 @@ in
|
|||
default = "error";
|
||||
description = lib.mdDoc "Log level";
|
||||
};
|
||||
|
||||
bendDomainToLocalhost = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Wether to add an entry to `/etc/hosts` for the configured nextcloud domain to point to `localhost` and add `localhost `to nextcloud's `trusted_proxies` config option.
|
||||
|
||||
This is useful when nextcloud's domain is not a static IP address and when the reverse proxy cannot be bypassed because the backend connection is done via unix socket.
|
||||
'';
|
||||
};
|
||||
} // (
|
||||
lib.genAttrs [
|
||||
"dbtype"
|
||||
|
|
@ -44,11 +55,14 @@ in
|
|||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.nextcloud-notify_push = let
|
||||
nextcloudUrl = "http${lib.optionalString config.services.nextcloud.https "s"}://${config.services.nextcloud.hostName}";
|
||||
nextcloudUrl = "http${lib.optionalString cfgN.https "s"}://${cfgN.hostName}";
|
||||
in {
|
||||
description = "Push daemon for Nextcloud clients";
|
||||
documentation = [ "https://github.com/nextcloud/notify_push" ];
|
||||
after = [ "phpfpm-nextcloud.service" ];
|
||||
after = [
|
||||
"phpfpm-nextcloud.service"
|
||||
"redis-nextcloud.service"
|
||||
];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment = {
|
||||
NEXTCLOUD_URL = nextcloudUrl;
|
||||
|
|
@ -57,7 +71,7 @@ in
|
|||
LOG = cfg.logLevel;
|
||||
};
|
||||
postStart = ''
|
||||
${config.services.nextcloud.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push
|
||||
${cfgN.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push
|
||||
'';
|
||||
script = let
|
||||
dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype;
|
||||
|
|
@ -76,7 +90,7 @@ in
|
|||
export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")"
|
||||
'' + ''
|
||||
export DATABASE_URL="${dbUrl}"
|
||||
${cfg.package}/bin/notify_push '${config.services.nextcloud.datadir}/config/config.php'
|
||||
${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php'
|
||||
'';
|
||||
serviceConfig = {
|
||||
User = "nextcloud";
|
||||
|
|
@ -87,10 +101,23 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${config.services.nextcloud.hostName}.locations."^~ /push/" = {
|
||||
proxyPass = "http://unix:${cfg.socketPath}";
|
||||
proxyWebsockets = true;
|
||||
recommendedProxySettings = true;
|
||||
networking.hosts = lib.mkIf cfg.bendDomainToLocalhost {
|
||||
"127.0.0.1" = [ cfgN.hostName ];
|
||||
"::1" = [ cfgN.hostName ];
|
||||
};
|
||||
|
||||
services = lib.mkMerge [
|
||||
{
|
||||
nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
|
||||
proxyPass = "http://unix:${cfg.socketPath}";
|
||||
proxyWebsockets = true;
|
||||
recommendedProxySettings = true;
|
||||
};
|
||||
}
|
||||
|
||||
(lib.mkIf cfg.bendDomainToLocalhost {
|
||||
nextcloud.extraOptions.trusted_proxies = [ "127.0.0.1" "::1" ];
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -551,6 +551,19 @@ in {
|
|||
default = true;
|
||||
};
|
||||
|
||||
configureRedis = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = config.services.nextcloud.notify_push.enable;
|
||||
defaultText = literalExpression "config.services.nextcloud.notify_push.enable";
|
||||
description = lib.mdDoc ''
|
||||
Wether to configure nextcloud to use the recommended redis settings for small instances.
|
||||
|
||||
::: {.note}
|
||||
The `notify_push` app requires redis to be configured. If this option is turned off, this must be configured manually.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
|
||||
caching = {
|
||||
apcu = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -1044,6 +1057,25 @@ in {
|
|||
}];
|
||||
};
|
||||
|
||||
services.redis.servers.nextcloud = lib.mkIf cfg.configureRedis {
|
||||
enable = true;
|
||||
user = "nextcloud";
|
||||
};
|
||||
|
||||
services.nextcloud = lib.mkIf cfg.configureRedis {
|
||||
caching.redis = true;
|
||||
extraOptions = {
|
||||
memcache = {
|
||||
distributed = ''\OC\Memcache\Redis'';
|
||||
locking = ''\OC\Memcache\Redis'';
|
||||
};
|
||||
redis = {
|
||||
host = config.services.redis.servers.nextcloud.unixSocket;
|
||||
port = 0;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.enable = mkDefault true;
|
||||
|
||||
services.nginx.virtualHosts.${cfg.hostName} = {
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ in
|
|||
t1 = time.monotonic()
|
||||
client1.shutdown()
|
||||
duration = time.monotonic() - t1
|
||||
assert duration < 30, f"shutdown took too long ({duration} seconds)"
|
||||
# FIXME: regressed in kernel 6.1.28, temporarily disabled while investigating
|
||||
# assert duration < 30, f"shutdown took too long ({duration} seconds)"
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,35 +1,49 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, fltk
|
||||
, fmt
|
||||
, rtmidi
|
||||
, libsamplerate
|
||||
, libmpg123
|
||||
, libsndfile
|
||||
, jack2
|
||||
, alsa-lib
|
||||
, libpulseaudio
|
||||
, libXpm
|
||||
, libXrandr
|
||||
, flac
|
||||
, libogg
|
||||
, libvorbis
|
||||
, libopus
|
||||
, nlohmann_json
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "giada";
|
||||
version = "unstable-2021-09-24";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monocasual";
|
||||
repo = pname;
|
||||
# Using master with https://github.com/monocasual/giada/pull/509 till a new release is done.
|
||||
rev = "f117a8b8eef08d904ef1ab22c45f0e1fad6b8a56";
|
||||
sha256 = "01hb981lrsyk870zs8xph5fm0z7bbffpkxgw04hq487r804mkx9j";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pKzc+RRW3o5vYaiGqW9/VjYZZJvr6cg1kdjP9qRkHwM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when updating to the next release, this PR is already merged
|
||||
# Fix fmt type error: https://github.com/monocasual/giada/pull/635
|
||||
(fetchpatch {
|
||||
name = "fix-fmt-type-error.patch";
|
||||
url = "https://github.com/monocasual/giada/commit/032af4334f6d2bb7e77a49e7aef5b4c4d696df9a.patch";
|
||||
hash = "sha256-QuxETvBWzA1v2ifyNzlNMGfQ6XhYQF03sGZA9rBx1xU=";
|
||||
})
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-w"
|
||||
"-Wno-error"
|
||||
|
|
@ -48,8 +62,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
rtmidi
|
||||
fltk
|
||||
fmt
|
||||
libmpg123
|
||||
libsndfile
|
||||
libsamplerate
|
||||
nlohmann_json
|
||||
alsa-lib
|
||||
libXpm
|
||||
libpulseaudio
|
||||
|
|
@ -58,20 +75,9 @@ stdenv.mkDerivation rec {
|
|||
libogg
|
||||
libvorbis
|
||||
libopus
|
||||
libXrandr
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
local fixup_list=(
|
||||
src/core/kernelMidi.cpp
|
||||
src/gui/elems/config/tabMidi.cpp
|
||||
src/utils/ver.cpp
|
||||
)
|
||||
for f in "''${fixup_list[@]}"; do
|
||||
substituteInPlace "$f" \
|
||||
--replace "<RtMidi.h>" "<${rtmidi.src}/RtMidi.h>"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians";
|
||||
homepage = "https://giadamusic.com/";
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightning";
|
||||
version = "23.02.2";
|
||||
version = "23.05";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
||||
sha256 = "sha256-fHGBwf79Q0DSLs/b+Lhg9kdIQzDn5rJYEB9yLkLbxlE=";
|
||||
sha256 = "sha256-6QbgK16godxnpIBHpykbblS10JAFZvxSeEpwnmdTrAo=";
|
||||
};
|
||||
|
||||
# when building on darwin we need dawin.cctools to provide the correct libtool
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.193.3";
|
||||
version = "1.194.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-zkSdMXIfUT+QfRi7CT3JlVLAvtLGbOGAaQkYNMAIZeI=";
|
||||
hash = "sha256-+zdboXU4Tg6RLRVwjS2FQGLfYZu/A09eoZUrYX4SK0o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
12
pkgs/applications/editors/cudatext/deps.json
generated
12
pkgs/applications/editors/cudatext/deps.json
generated
|
|
@ -16,13 +16,13 @@
|
|||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.07",
|
||||
"hash": "sha256-ZdN+dUmM8DQ7nz0LqcCQt8ZoJH1wrhYRa+h0xj5F6PY="
|
||||
"rev": "2023.05.13",
|
||||
"hash": "sha256-GP7qzCfL8KNXF/CvoeJshA3YbNE5+wuZ2VYn8hLEPlo="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.02",
|
||||
"hash": "sha256-bPib2pJqxb+m9eMGerClj1bvAoHcGH2OTmmKon6UQfo="
|
||||
"rev": "2023.05.12",
|
||||
"hash": "sha256-/BAWc5RR7hZCNjyuLqiq9OdJxvRqliMWiC7o0tCtELY="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.02",
|
||||
"hash": "sha256-EKJnkwQ7QTUTVaXOA1pi5YUHxaA/hu4qpgpHHaON61k="
|
||||
"rev": "2023.05.12",
|
||||
"hash": "sha256-Y+F/pdPzmXqqCqB0TCOboA4md/2QMHhzlVxR5NJF3+0="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
|||
|
|
@ -14,18 +14,18 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
craftos2-lua = fetchFromGitHub {
|
||||
owner = "MCJack123";
|
||||
repo = "craftos2-lua";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lMqYfSA3sI7+glRE+eUf03uLfbf7lipmoqgt74FUaJQ=";
|
||||
sha256 = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY=";
|
||||
};
|
||||
craftos2-rom = fetchFromGitHub {
|
||||
owner = "McJack123";
|
||||
repo = "craftos2-rom";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t76Yltx7vHNoAAFvNpYLKuwFja4On6M20upmG6w3C1M=";
|
||||
sha256 = "sha256-BXTsBMlsymQHABWQCiv22Ia5jm2xv1jNy7Unwymtyp0=";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "MCJack123";
|
||||
repo = "craftos2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a7oMLfjZUkEWPjxDDywlSW4qLhcQrCXPPY2BEOgiafU=";
|
||||
sha256 = "sha256-Vb6mvim42Kvn7A3Qsp4gvTRBGQ5OJ9pVij96LZwWyuQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ];
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ let
|
|||
};
|
||||
|
||||
xrdp = stdenv.mkDerivation rec {
|
||||
version = "0.9.21.1";
|
||||
version = "0.9.22";
|
||||
pname = "xrdp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -42,7 +42,7 @@ let
|
|||
repo = "xrdp";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-/o052ij+Tpcw5/k1UyP6OGOzrtBwh3jRkftStIEhUF0=";
|
||||
hash = "sha256-/i2rLVrN1twKtQH6Qt1OZOPGZzegWBOKpj0Wnin8cR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
, jsoncpp
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, Foundation
|
||||
, AppKit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -41,11 +43,12 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ jsoncpp libGL ];
|
||||
buildInputs = [ jsoncpp libGL ] ++ lib.optionals stdenv.isDarwin [ Foundation AppKit ];
|
||||
|
||||
cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ];
|
||||
|
||||
meta = with lib;{
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://github.com/ValveSoftware/openvr";
|
||||
description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "accelerate";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fCIvVbMaWAWzRfPc5/1CZq3gZ8kruuk9wBt8mzLHmyw=";
|
||||
hash = "sha256-gW4wCpkyxoWfxXu8UHZfgopSQhOoPhGgqEqFiHJ+Db4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, aiolifx
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, async-timeout
|
||||
, pythonOlder
|
||||
, typer
|
||||
}:
|
||||
|
||||
|
|
@ -31,6 +31,11 @@ buildPythonPackage rec {
|
|||
--replace "typer = " "# unused: typer = "
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'aiolifx = "^0.8.6"' 'aiolifx = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,31 +1,35 @@
|
|||
{ lib
|
||||
, async-timeout
|
||||
, click
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, ifaddr
|
||||
, inquirerpy
|
||||
, bitstring
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx";
|
||||
version = "0.8.10";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NiNKFrWxpGkwbb7tFEDD5jZ6ETW20BBIqrdjCsL/DkY=";
|
||||
hash = "sha256-oK8Ih62EFwu3X5PNVFLH+Uce6ZBs7IMXet5/DHxfd5M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
bitstring
|
||||
click
|
||||
ifaddr
|
||||
inquirerpy
|
||||
];
|
||||
|
||||
# tests are not implemented
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-reservations";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-P6GLB5+2p9sS9XSwSykQXHXw5YrJNNSgs5d7sy5jHTk=";
|
||||
hash = "sha256-BHCFEFst5jfyIEo0hm86belpxW7EygZCBJ8PTqzqHKc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cpyparsing";
|
||||
version = "2.4.7.1.2.0";
|
||||
version = "2.4.7.1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,12 +18,16 @@ buildPythonPackage rec {
|
|||
owner = "evhub";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cb0Lx+S9WnPa9veHJaYEU7pFCtB6pG/GKf4HK/UbmtU=";
|
||||
hash = "sha256-HJ0I5DKZ2WV+1pXZCvJHA7Wih3Gkn7vL/ojXnTssKxw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pexpect ];
|
||||
nativeCheckInputs = [
|
||||
pexpect
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} tests/cPyparsing_test.py
|
||||
|
|
@ -36,6 +40,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Cython PyParsing implementation";
|
||||
homepage = "https://github.com/evhub/cpyparsing";
|
||||
changelog = "https://github.com/evhub/cpyparsing/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fabianhjr ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,16 +1,21 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.2.post0";
|
||||
version = "2.3.post0";
|
||||
pname = "crc32c";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ICRAR";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0FgNOVpgJTxRALuufZ7Dt1TwuX+zqw35yCq8kmq4RTc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lPEojWeAhfWpGR+k+Tuo4n68iZOk7lUDxjWXj5vN4I0=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Python software implementation and hardware API of CRC32C checksum algorithm";
|
||||
homepage = "https://github.com/ICRAR/crc32c";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cwl-utils";
|
||||
version = "0.24";
|
||||
version = "0.26";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "common-workflow-language";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g8HnY5/UDmujijXStNRwKBGMZ3soUHKPIlpJdIQaAlE=";
|
||||
hash = "sha256-T82zaXILbQFOIE0/HhNjpYutSdA1UeaxXO/M7Z4sSfo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ffmpeg-progress-yield";
|
||||
version = "0.7.1";
|
||||
version = "0.7.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wK33h+Qg737hSv+2HF4hvfBDDsJpI+7mGbRgUQvrZb0=";
|
||||
hash = "sha256-gBWkoR0cJdcWShX9aIDt6DpK1dkT9bfvgnrgXGgZPSQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama tqdm ];
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-testing";
|
||||
version = "1.54.0";
|
||||
version = "1.54.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/0LlPGUVhV7lh4RDQH7wImxaynN2wDLoELxoUUG8bpM=";
|
||||
hash = "sha256-qCMOjSfe7eGIWyomTLiLrLrt/GekmLdlMO2VnPihgI0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.5.0";
|
||||
version = "2023.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4isf3U4Wp5FCQ0zVfmDLK+zkq/IXLFZhiaL6AYRXaRY=";
|
||||
hash = "sha256-YsvsT1TKAlMGS9F3zDuruXnC/COFbR5ApPFzh+hzQyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
62
pkgs/development/python-modules/inquirerpy/default.nix
Normal file
62
pkgs/development/python-modules/inquirerpy/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, furo
|
||||
, myst-parser
|
||||
, pfzy
|
||||
, poetry-core
|
||||
, prompt-toolkit
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sphinx
|
||||
, sphinx-autobuild
|
||||
, sphinx-copybutton
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inquirerpy";
|
||||
version = "0.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kazhala";
|
||||
repo = "InquirerPy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ktqzxuj4aBHrgjiOyoDLuqbN0FJqwUpoyq3LuqXxt2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pfzy
|
||||
prompt-toolkit
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"InquirerPy"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# AttributeError: '_GeneratorContextManager' object has no attribute 'close'
|
||||
"tests/prompts/"
|
||||
"tests/base/test_simple.py"
|
||||
"tests/base/test_complex.py"
|
||||
"tests/base/test_list.py"
|
||||
];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python port of Inquirer.js";
|
||||
homepage = "https://github.com/kazhala/InquirerPy";
|
||||
changelog = "https://github.com/kazhala/InquirerPy/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +1,32 @@
|
|||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, tqdm
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, docopt
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, jsonpatch
|
||||
, schema
|
||||
, responses
|
||||
, lib
|
||||
, glibcLocales
|
||||
, setuptools
|
||||
, tqdm
|
||||
, urllib3
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
format = "setuptools";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vrvktAuijBKo3IsMQzUs5EyfwFCFGmvXZ4kCvlbeGWE=";
|
||||
# no tests data included in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "jjjake";
|
||||
repo = "internetarchive";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-apBzx1qMHEA0wiWh82sS7I+AaiMEoAchhPsrtAgujbQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -37,16 +39,30 @@ buildPythonPackage rec {
|
|||
urllib3
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytest responses glibcLocales ];
|
||||
nativeCheckInputs = [
|
||||
responses
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# tests depend on network
|
||||
doCheck = false;
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_get_item_with_kwargs"
|
||||
"test_upload"
|
||||
"test_upload_metadata"
|
||||
"test_upload_queue_derive"
|
||||
"test_upload_validate_identifie"
|
||||
"test_upload_validate_identifier"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
LC_ALL=en_US.utf-8 pytest tests
|
||||
'';
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"tests/cli/test_ia.py"
|
||||
"tests/cli/test_ia_download.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "internetarchive" ];
|
||||
pythonImportsCheck = [
|
||||
"internetarchive"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python and Command-Line Interface to Archive.org";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peft";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NPpY29HMQe5KT0JdlLAXY9MVycDslbP2i38NSTirB3I=";
|
||||
hash = "sha256-7j//SDuld2ANxEcG4R0rK5vEaTX7gQwWRH56PO2KqAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
36
pkgs/development/python-modules/pfzy/default.nix
Normal file
36
pkgs/development/python-modules/pfzy/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pfzy";
|
||||
version = "0.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kazhala";
|
||||
repo = "pfzy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+Ba/yLUfT0SPPAJd+pKyjSvNrVpEwxW3xEKFx4JzpYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pfzy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python port of the fzy fuzzy string matching algorithm";
|
||||
homepage = "https://github.com/kazhala/pfzy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-ironicclient";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yYmzZuwZSasN6g6Bosivexe5oOy3dP+l/cD5TkXC87g=";
|
||||
hash = "sha256-bnWUfNIx85vSV0P5zcI7syjP0+wTXYDmC8wiuInjGfc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "thinc";
|
||||
version = "8.1.8";
|
||||
version = "8.1.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NcZXy+2wT8W8JHhl1mWSHOw9Ve81+/zj7hogSGtyBoM=";
|
||||
hash = "sha256-bEpI19oH4EToSmjLubIvMvhJCZWiurC/xg5BLRSvuZE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "troposphere";
|
||||
version = "4.3.0";
|
||||
version = "4.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "cloudtools";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YciNwiLb/1fUYmlWtDRaJgtkgJi1mMt2FgeJKQi9yRg=";
|
||||
hash = "sha256-8vIpwZBUdU9gD1Ya0+L1phMDMcAABtuyRx4quDfQWGA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,26 +1,53 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, authlib, tqdm, validators }:
|
||||
{ lib
|
||||
, authlib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, tqdm
|
||||
, validators
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weaviate-client";
|
||||
version = "3.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QjpSZRijJQXFKTMo5fJS5su/IOSzEkcz9w0Q/A1oI8k=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2,<0.21.0"
|
||||
--replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2" \
|
||||
--replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ authlib tqdm validators ];
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
authlib
|
||||
tqdm
|
||||
validators
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"weaviate"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python native client for easy interaction with a Weaviate instance";
|
||||
homepage = "https://github.com/weaviate/weaviate-python-client";
|
||||
description = "A python native client for easy interaction with a Weaviate instance.";
|
||||
changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pylyzer";
|
||||
version = "0.0.26";
|
||||
version = "0.0.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtshiba";
|
||||
repo = "pylyzer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZEmTSSYHQWk0IVJXlrtGb+j2hbb9ZtDLCtajOR7BMoU=";
|
||||
hash = "sha256-RtfRYycHSDaOE71tTtChdMJKyRyTqracHw4p94heFwU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/QMzPvLcAjpai2YX58+YM/+KhYZRuK59hPYAEHeTTa4=";
|
||||
cargoHash = "sha256-Ggvcg96j9LlhDy0BMJzNDXE1Qtf04svt2ezXmkq3aUA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
|
|
|
|||
|
|
@ -1,31 +1,20 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, makeWrapper
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_mixer
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, makeWrapper, SDL2, SDL2_image, SDL2_mixer
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "infra-arcana";
|
||||
version = "21.0.1";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "martin-tornqvist";
|
||||
repo = "ia";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E2ssxdYa27qRk5cCmM7A5VqXGExwXHblR34y+rOUBRI=";
|
||||
sha256 = "sha256-EFpeuzxhRriQOBtmw0D+SY6sOWGyY8iA5Xnm6PCaMX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [ SDL2 SDL2_image SDL2_mixer ];
|
||||
|
||||
# Some parts of the game don't compile with glibc 2.34. As soon as
|
||||
# this is fixed upstream we can switch to the default build flags.
|
||||
buildFlags = [ "ia" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
@ -35,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
rm -rf CMake* cmake* compile_commands.json CTest* Makefile
|
||||
cp -ra * $out/opt/ia
|
||||
|
||||
# Uses relative paths when looking for assets
|
||||
# IA uses relative paths when looking for assets
|
||||
wrapProgram $out/opt/ia/ia --run "cd $out/opt/ia"
|
||||
ln -s $out/opt/ia/ia $out/bin/infra-arcana
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.4105";
|
||||
version = "0.20.4145";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha512-XDYuFly7hy55L76Vn92mphK/rP90/4OT50In7p9kyU8L/4W0WljrMUycIFKYsQfdJsKmQgz7z2Bw8bw2fHEuSQ==";
|
||||
hash = "sha512-7zPrKKkqn4LllzRplxoAoOSSgRJGeE1D1p+42EZD+C9DKwsoToJ8RJlpF30lMoWbrul7a7h0fAjGPJvYwRovFQ==";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snac2";
|
||||
version = "2.30";
|
||||
version = "2.31";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-iHVoecIvRKE1nzzq8WdI4wuNBRfad0usOVHpyz6iekU=";
|
||||
hash = "sha256-zkeoj+l82aP3/rXn7JuNS4OvAGnHaVRz+xXxPEPMEs8=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl openssl ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgvector";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgvector";
|
||||
repo = "pgvector";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1mFHjHGB9KVZfPvuaC3sZzyzJvX49PjADVVJn1fSjgs=";
|
||||
hash = "sha256-zx1IFhBVi0KLhQgnacCHS5VQUwcxXQAWpc1J+LrtcRU=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "salt";
|
||||
version = "3006.0";
|
||||
version = "3006.1";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7iw4s06oYUCQE8gc8KqFKX1pzxB3O3PuegcQtclC3Mo=";
|
||||
hash = "sha256-lVh71hHepq/7aQjQ7CaGy37bhMFBRLSFF3bxJ6YOxbk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ueberzugpp";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstkdng";
|
||||
repo = "ueberzugpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PTI+jIsXq4yh8TBAT1p1CLbBMDW1U323WgPoASz2pwA=";
|
||||
hash = "sha256-9FGuElHWuqTuzHNcb9p0HX0AFMmZc+MRc5+EP5cvBaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "ueberzug";
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
From 95d86c080a559d9c9f0498fb93d43d3fef377080 Mon Sep 17 00:00:00 2001
|
||||
From: Jack Leightcap <jack@leightcap.com>
|
||||
Date: Sat, 13 May 2023 17:28:54 -0400
|
||||
Subject: [PATCH] Relax Amaranth git dependency
|
||||
|
||||
Signed-off-by: Jack Leightcap <jack@leightcap.com>
|
||||
---
|
||||
software/pyproject.toml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/software/pyproject.toml b/software/pyproject.toml
|
||||
index 6d1e2f1..6dfcc9e 100644
|
||||
--- a/software/pyproject.toml
|
||||
+++ b/software/pyproject.toml
|
||||
@@ -20,8 +20,8 @@ classifiers = [
|
||||
]
|
||||
|
||||
dependencies = [
|
||||
- "amaranth @ git+https://github.com/amaranth-lang/amaranth.git",
|
||||
- "fx2>=0.11",
|
||||
+ "amaranth",
|
||||
+ "fx2",
|
||||
"libusb1>=1.8.1",
|
||||
"aiohttp~=3.8",
|
||||
"pyvcd",
|
||||
--
|
||||
2.38.4
|
||||
|
||||
|
|
@ -9,28 +9,33 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "glasgow";
|
||||
version = "unstable-2021-12-12";
|
||||
# python software/setup.py --version
|
||||
realVersion = "0.1.dev1679+g${lib.substring 0 7 src.rev}";
|
||||
version = "unstable-2023-04-15";
|
||||
# python -m setuptools_scm
|
||||
realVersion = "0.1.dev2+g${lib.substring 0 7 src.rev}";
|
||||
|
||||
patches = [ ./0001-Relax-Amaranth-git-dependency.patch ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GlasgowEmbedded";
|
||||
repo = "glasgow";
|
||||
rev = "e640a778c446b7e9812727e73c560d12aeb41d7c";
|
||||
sha256 = "EsQ9ZjalKDQ54JOonra4yPDI56cF5n86y/Rd798cZsU=";
|
||||
rev = "406e06fae5c85f6f773c9839747513874bc3ec77";
|
||||
sha256 = "sha256-s4fWpKJj6n2+CIAsD2bjr5K8RhJz1H1sFnjiartNGf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.setuptools-scm sdcc ];
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.setuptools-scm
|
||||
sdcc
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
aiohttp
|
||||
amaranth
|
||||
bitarray
|
||||
crc
|
||||
fx2
|
||||
libusb1
|
||||
aiohttp
|
||||
pyvcd
|
||||
bitarray
|
||||
crcmod
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ yosys icestorm nextpnr ];
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libreswan";
|
||||
version = "4.10";
|
||||
version = "4.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-WpQAwlqO26B0IEJvtV3Lqv2qNwLlsPLBkgWmxWckins=";
|
||||
sha256 = "sha256-QpqRf+SlUmDxUs+zGIpYflsS6UoU4kCsElMZ/xS4yD0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, buildPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mawk";
|
||||
|
|
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-bbejKsecURB60xpAfU+SxrhC3eL2inUztOe3sD6JAL4=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interpreter for the AWK Programming Language";
|
||||
homepage = "https://invisible-island.net/mawk/mawk.html";
|
||||
|
|
|
|||
|
|
@ -23221,7 +23221,9 @@ with pkgs;
|
|||
|
||||
openvdb = callPackage ../development/libraries/openvdb { };
|
||||
|
||||
openvr = callPackage ../development/libraries/openvr { };
|
||||
openvr = callPackage ../development/libraries/openvr {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
|
||||
};
|
||||
|
||||
inherit (callPackages ../development/libraries/libressl { })
|
||||
libressl_3_4
|
||||
|
|
|
|||
|
|
@ -4873,6 +4873,8 @@ self: super: with self; {
|
|||
|
||||
inquirer = callPackage ../development/python-modules/inquirer { };
|
||||
|
||||
inquirerpy = callPackage ../development/python-modules/inquirerpy { };
|
||||
|
||||
inscriptis = callPackage ../development/python-modules/inscriptis { };
|
||||
|
||||
insegel = callPackage ../development/python-modules/insegel { };
|
||||
|
|
@ -7378,6 +7380,8 @@ self: super: with self; {
|
|||
|
||||
pexpect = callPackage ../development/python-modules/pexpect { };
|
||||
|
||||
pfzy = callPackage ../development/python-modules/pfzy { };
|
||||
|
||||
pg8000 = callPackage ../development/python-modules/pg8000 { };
|
||||
|
||||
pgcli = callPackage ../development/python-modules/pgcli { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue