mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
296d2f6991
|
|
@ -6989,6 +6989,11 @@
|
|||
githubId = 615606;
|
||||
name = "Glenn Searby";
|
||||
};
|
||||
Gliczy = {
|
||||
name = "Gliczy";
|
||||
github = "Gliczy";
|
||||
githubId = 129636582;
|
||||
};
|
||||
glittershark = {
|
||||
name = "Griffin Smith";
|
||||
email = "root@gws.fyi";
|
||||
|
|
@ -10757,6 +10762,12 @@
|
|||
name = "Yanning Chen";
|
||||
matrix = "@self:lightquantum.me";
|
||||
};
|
||||
Ligthiago = {
|
||||
email = "donets.andre@gmail.com";
|
||||
github = "Ligthiago";
|
||||
githubId = 142721811;
|
||||
name = "Andrey Donets";
|
||||
};
|
||||
lihop = {
|
||||
email = "nixos@leroy.geek.nz";
|
||||
github = "lihop";
|
||||
|
|
|
|||
|
|
@ -579,6 +579,7 @@
|
|||
./services/home-automation/ebusd.nix
|
||||
./services/home-automation/esphome.nix
|
||||
./services/home-automation/evcc.nix
|
||||
./services/home-automation/govee2mqtt.nix
|
||||
./services/home-automation/home-assistant.nix
|
||||
./services/home-automation/homeassistant-satellite.nix
|
||||
./services/home-automation/zigbee2mqtt.nix
|
||||
|
|
|
|||
|
|
@ -219,7 +219,6 @@ in
|
|||
inherit (cert) action;
|
||||
authority = {
|
||||
inherit remote;
|
||||
file.path = cert.caCert;
|
||||
root_ca = cert.caCert;
|
||||
profile = "default";
|
||||
auth_key_file = certmgrAPITokenPath;
|
||||
|
|
|
|||
90
nixos/modules/services/home-automation/govee2mqtt.nix
Normal file
90
nixos/modules/services/home-automation/govee2mqtt.nix
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.govee2mqtt;
|
||||
in {
|
||||
meta.maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
|
||||
options.services.govee2mqtt = {
|
||||
enable = lib.mkEnableOption "Govee2MQTT";
|
||||
|
||||
package = lib.mkPackageOption pkgs "govee2mqtt" { };
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "govee2mqtt";
|
||||
description = "User under which Govee2MQTT should run.";
|
||||
};
|
||||
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "govee2mqtt";
|
||||
description = "Group under which Govee2MQTT should run.";
|
||||
};
|
||||
|
||||
environmentFile = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
example = "/var/lib/govee2mqtt/govee2mqtt.env";
|
||||
description = ''
|
||||
Environment file as defined in {manpage}`systemd.exec(5)`.
|
||||
|
||||
See upstream documentation <https://github.com/wez/govee2mqtt/blob/main/docs/CONFIG.md>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
users = {
|
||||
groups.${cfg.group} = { };
|
||||
users.${cfg.user} = {
|
||||
description = "Govee2MQTT service user";
|
||||
inherit (cfg) group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.govee2mqtt = {
|
||||
description = "Govee2MQTT Service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "networking.target" ];
|
||||
serviceConfig = {
|
||||
CacheDirectory = "govee2mqtt";
|
||||
Environment = [
|
||||
"GOVEE_CACHE_DIR=/var/cache/govee2mqtt"
|
||||
];
|
||||
EnvironmentFile = cfg.environmentFile;
|
||||
ExecStart = "${lib.getExe cfg.package} serve --govee-iot-key=/var/lib/govee2mqtt/iot.key --govee-iot-cert=/var/lib/govee2mqtt/iot.cert"
|
||||
+ " --amazon-root-ca=${pkgs.cacert.unbundled}/etc/ssl/certs/Amazon_Root_CA_1:66c9fcf99bf8c0a39e2f0788a43e696365bca.crt";
|
||||
Group = cfg.group;
|
||||
Restart = "on-failure";
|
||||
StateDirectory = "govee2mqtt";
|
||||
User = cfg.user;
|
||||
|
||||
# Hardening
|
||||
AmbientCapabilities = "";
|
||||
CapabilityBoundingSet = "";
|
||||
LockPersonality = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateMounts = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
RemoveIPC = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -71,7 +71,6 @@ in
|
|||
after = [ "network.target" ];
|
||||
environment.ZIGBEE2MQTT_DATA = cfg.dataDir;
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
ExecStart = "${cfg.package}/bin/zigbee2mqtt";
|
||||
User = "zigbee2mqtt";
|
||||
Group = "zigbee2mqtt";
|
||||
|
|
|
|||
|
|
@ -165,10 +165,17 @@ in
|
|||
type = lib.types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options.pam_allowed_login_groups = lib.mkOption {
|
||||
description = lib.mdDoc "Kanidm groups that are allowed to login using PAM.";
|
||||
example = "my_pam_group";
|
||||
type = lib.types.listOf lib.types.str;
|
||||
options = {
|
||||
pam_allowed_login_groups = lib.mkOption {
|
||||
description = lib.mdDoc "Kanidm groups that are allowed to login using PAM.";
|
||||
example = "my_pam_group";
|
||||
type = lib.types.listOf lib.types.str;
|
||||
};
|
||||
hsm_pin_path = lib.mkOption {
|
||||
description = lib.mdDoc "Path to a HSM pin.";
|
||||
default = "/var/cache/kanidm-unixd/hsm-pin";
|
||||
type = lib.types.path;
|
||||
};
|
||||
};
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
|
|
|
|||
|
|
@ -605,7 +605,7 @@ let
|
|||
description = "Tiny Tiny RSS feeds update daemon";
|
||||
|
||||
preStart = ''
|
||||
${pkgs.php81}/bin/php ${cfg.root}/www/update.php --update-schema
|
||||
${pkgs.php81}/bin/php ${cfg.root}/www/update.php --update-schema --force-yes
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -361,10 +361,12 @@ let
|
|||
${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"}
|
||||
${optionalString (vhost.acmeRoot != null) "root ${vhost.acmeRoot};"}
|
||||
auth_basic off;
|
||||
auth_request off;
|
||||
}
|
||||
${optionalString (vhost.acmeFallbackHost != null) ''
|
||||
location @acme-fallback {
|
||||
auth_basic off;
|
||||
auth_request off;
|
||||
proxy_pass http://${vhost.acmeFallbackHost};
|
||||
}
|
||||
''}
|
||||
|
|
|
|||
|
|
@ -31,16 +31,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yazi";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sxyazi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XF5zCFXiViFsRPqI6p1Z7093NSWrGmcoyWcGEagIoEA=";
|
||||
hash = "sha256-2AiaJs6xY8hsB1DBxpPwdZtc8IZvsoCGWBOFVMf4dvk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9fXHpq5lXG9Gup1dZPlXiNilbP79fJ3Jp3+ZD7mAzP4=";
|
||||
cargoHash = "sha256-fRUmXv27sHYz8z0cc795JCPLHDQGgTV4wAWAtQ/pbg4=";
|
||||
|
||||
env.YAZI_GEN_COMPLETIONS = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,19 +11,20 @@
|
|||
, qtbase
|
||||
, qtcharts
|
||||
, tuxclocker-plugins
|
||||
, tuxclocker-without-unfree
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tuxclocker";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lurkki14";
|
||||
repo = "tuxclocker";
|
||||
fetchSubmodules = true;
|
||||
rev = "${finalAttrs.version}";
|
||||
hash = "sha256-8dtuZXBWftXNQpqYgNQOayPGfvEIu9QfbqDShfkt1qA=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-VJchgImSGykenss4/TyLATljYMMXNmgLSMT8ixSnReA=";
|
||||
};
|
||||
|
||||
# Meson doesn't find boost without these
|
||||
|
|
@ -56,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-Dplugins=false"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit tuxclocker-without-unfree;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt overclocking tool for GNU/Linux";
|
||||
homepage = "https://github.com/Lurkki14/tuxclocker";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aiac";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
excludedPackages = [".ci"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gofireflyio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X3KmqKltoIFyMjLF1h8EN3RLbZ+EZu0mOH2koN0FJh8=";
|
||||
hash = "sha256-83htckX3AIgLKxxSIaM3HUJDDv4GrpJsZ7nGln5trKw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JWQQUB4/yIDGzWeshtcWnkXQS7jYcDHwG/tef6sBizQ=";
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cmctl";
|
||||
version = "1.13.3";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cert-manager";
|
||||
repo = "cert-manager";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bmlM5WyJd5EtL3e4mPHwCqoIyDAgN7Ce7/vS6bhVuP0=";
|
||||
hash = "sha256-tS/s8zrOomuUBIoIh81RMdwmPM9pcz4cNSKVQfNxlrI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/ctl";
|
||||
|
||||
vendorHash = "sha256-PQKPZXgp6ggWymVBOErmLps0cilOsE54t108ApZoiDQ=";
|
||||
vendorHash = "sha256-9Y8u6DVS08liliMNEalX6XQU50qRFy5qZq/9EvRSBRQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.31.7";
|
||||
version = "0.31.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DRxS2zhDLAC1pfsHiOEU9Xi7DhKcPwzdI3yw5JbbT18=";
|
||||
hash = "sha256-sZtMeFoi3UJO5uV4zOez1TbpBCtfclGhZTrYGZ/+Mio=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-7eeGME3KOebYYEJEFrrA+5F8rdtYT18WnRoouGyEMD8=";
|
||||
vendorHash = "sha256-0Tq74BtSk5mp0eZjTevvDFWnEc5tnSwO7ZckcJXd/Yo=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
|
@ -42,6 +42,11 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
# k9s requires a writeable log directory
|
||||
# Otherwise an error message is printed
|
||||
# into the completion scripts
|
||||
export K9S_LOGS_DIR=$(mktemp -d)
|
||||
|
||||
installShellCompletion --cmd k9s \
|
||||
--bash <($out/bin/k9s completion bash) \
|
||||
--fish <($out/bin/k9s completion fish) \
|
||||
|
|
|
|||
|
|
@ -82,5 +82,6 @@ rustPlatform.buildRustPackage rec {
|
|||
changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "halloy";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mujoco";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
# Bumping version? Make sure to look though the MuJoCo's commit
|
||||
# history for bumped dependency pins!
|
||||
|
|
@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "google-deepmind";
|
||||
repo = "mujoco";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+2nt7G8j6Pi60cfMBPYWPGwD8wpxDOSylenm0oCitzM=";
|
||||
hash = "sha256-Zbz6qq2Sjhcrf8QAGFlYkSZ8mA/wQaP81gRzMj3xh+g=";
|
||||
};
|
||||
|
||||
patches = [ ./mujoco-system-deps-dont-fetch.patch ];
|
||||
|
|
@ -183,5 +183,6 @@ in stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela tmplt ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "commitizen";
|
||||
version = "3.13.0";
|
||||
version = "3.14.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "commitizen-tools";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6Zo+d1OuaHYVf/KX8hKlyp/YS/1tHFmpNK6ssnxg7h0=";
|
||||
hash = "sha256-yRcc87V4XJuTyrngQgPGJozk+hd7SRHERLvsQ/yZKYQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -21,5 +21,9 @@ libgit2.overrideAttrs (oldAttrs: {
|
|||
hash = "sha256-Bm3Gj9+AhNQMvkIqdrTkK5D9vrZ1qq6CS8Wrn9kfKiw=";
|
||||
};
|
||||
|
||||
# this is a heavy fork of the original libgit2
|
||||
# the original checkPhase does not work for this fork
|
||||
doCheck = false;
|
||||
|
||||
patches = [ ];
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,17 +4,27 @@
|
|||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apfsprogs";
|
||||
version = "unstable-2023-06-06";
|
||||
version = "unstable-2023-11-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-apfs";
|
||||
repo = "apfsprogs";
|
||||
rev = "91827679dfb1d6f5719fbe22fa67e89c17adb133";
|
||||
hash = "sha256-gF7bOozAGGpuVP23mnPW81qH2gnVUdT9cxukzGJ+ydI=";
|
||||
rev = "990163894d871f51ba102a75aed384a275c5991b";
|
||||
hash = "sha256-yCShZ+ALzSe/svErt9/i1JyyEvbIeABGPbpS4lVil0A=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
shortRev = builtins.substring 0 9 finalAttrs.src.rev;
|
||||
in ''
|
||||
substituteInPlace \
|
||||
apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile \
|
||||
--replace \
|
||||
'$(shell git describe --always HEAD | tail -c 9)' \
|
||||
'${shortRev}'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make -C apfs-snap $makeFlags
|
||||
|
|
@ -35,6 +45,8 @@ stdenv.mkDerivation {
|
|||
apfs = nixosTests.apfs;
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Experimental APFS tools for linux";
|
||||
homepage = "https://github.com/linux-apfs/apfsprogs";
|
||||
|
|
@ -42,4 +54,4 @@ stdenv.mkDerivation {
|
|||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
})
|
||||
62
pkgs/by-name/ds/dsda-doom/package.nix
Normal file
62
pkgs/by-name/ds/dsda-doom/package.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
, SDL2_image
|
||||
, fluidsynth
|
||||
, soundfont-fluid
|
||||
, portmidi
|
||||
, dumb
|
||||
, libvorbis
|
||||
, libmad
|
||||
, libGLU
|
||||
, libzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dsda-doom";
|
||||
version = "0.27.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kraflab";
|
||||
repo = "dsda-doom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+rvRj6RbJ/RaKmlDZdB2oBm/U6SuHNxye8TdpEOZwQw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/prboom2";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
SDL2_image
|
||||
fluidsynth
|
||||
portmidi
|
||||
dumb
|
||||
libvorbis
|
||||
libmad
|
||||
libGLU
|
||||
libzip
|
||||
];
|
||||
|
||||
# Fixes impure path to soundfont
|
||||
prePatch = ''
|
||||
substituteInPlace src/m_misc.c --replace \
|
||||
"/usr/share/sounds/sf3/default-GM.sf3" \
|
||||
"${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kraflab/dsda-doom";
|
||||
description = "An advanced Doom source port with a focus on speedrunning, successor of PrBoom+";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.Gliczy ];
|
||||
};
|
||||
}
|
||||
68
pkgs/by-name/fo/foonathan-memory/package.nix
Normal file
68
pkgs/by-name/fo/foonathan-memory/package.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, doctest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "foonathan-memory";
|
||||
version = "0.7-3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foonathan";
|
||||
repo = "memory";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nLBnxPbPKiLCFF2TJgD/eJKJJfzktVBW3SRW2m3WK/s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# do not download doctest, use the system doctest instead
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch";
|
||||
hash = "sha256-/MuDeeIh+7osz11VfsAsQzm9HMZuifff+MDU3bDDxRE=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "FOONATHAN_MEMORY_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [ doctest ];
|
||||
|
||||
# fix a circular dependency between "out" and "dev" outputs
|
||||
postInstall = ''
|
||||
mkdir -p $dev/lib
|
||||
mv $out/lib/foonathan_memory $dev/lib/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/foonathan/memory";
|
||||
changelog = "https://github.com/foonathan/memory/releases/tag/${finalAttrs.src.rev}";
|
||||
description = "STL compatible C++ memory allocator library";
|
||||
|
||||
longDescription = ''
|
||||
The C++ STL allocator model has various flaws. For example, they are
|
||||
fixed to a certain type, because they are almost necessarily required to
|
||||
be templates. So you can't easily share a single allocator for multiple
|
||||
types. In addition, you can only get a copy from the containers and not
|
||||
the original allocator object. At least with C++11 they are allowed to be
|
||||
stateful and so can be made object not instance based. But still, the
|
||||
model has many flaws. Over the course of the years many solutions have
|
||||
been proposed, for example EASTL. This library is another. But instead of
|
||||
trying to change the STL, it works with the current implementation.
|
||||
'';
|
||||
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ panicgh ];
|
||||
platforms = with platforms; unix ++ windows;
|
||||
};
|
||||
})
|
||||
41
pkgs/by-name/go/govee2mqtt/dont-vendor-openssl.diff
Normal file
41
pkgs/by-name/go/govee2mqtt/dont-vendor-openssl.diff
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 303f6f8..952a7ff 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1373,15 +1373,6 @@ version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||
|
||||
-[[package]]
|
||||
-name = "openssl-src"
|
||||
-version = "300.2.1+3.2.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.98"
|
||||
@@ -1390,7 +1381,6 @@ checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
- "openssl-src",
|
||||
"pkg-config",
|
||||
"vcpkg",
|
||||
]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index a4cf25c..42fde6d 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -44,7 +44,7 @@ parking_lot = "0.12.1"
|
||||
|
||||
[dependencies.mosquitto-rs]
|
||||
version="0.11.1"
|
||||
-features = ["vendored-openssl"]
|
||||
+features = ["router"]
|
||||
#path = "../mosquitto-rs/mosquitto-rs"
|
||||
|
||||
[dev-dependencies]
|
||||
56
pkgs/by-name/go/govee2mqtt/package.nix
Normal file
56
pkgs/by-name/go/govee2mqtt/package.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ rustPlatform
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, openssl
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "govee2mqtt";
|
||||
version = "2024.01.24-ea3cd430";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = "govee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-iGOj0a4+wLd8QlM1tr+NYfd2tuwgHV+u5dt0zf+WscY=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
./dont-vendor-openssl.diff
|
||||
];
|
||||
|
||||
patches = [
|
||||
# update test fixtures https://github.com/wez/govee2mqtt/pull/120
|
||||
(fetchpatch {
|
||||
url = "https://github.com/wez/govee2mqtt/commit/0c2dc3e1cc1ccd44ddf98ead34e081ac4b4335f1.patch";
|
||||
hash = "sha256-0TNYyvRRcMkE9FYPcVoKburejhAn/cVYM3eaobS4nx8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/service/http.rs \
|
||||
--replace '"assets"' '"${placeholder "out"}/share/govee2mqtt/assets"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-wApf+H5T7HPkCGQwv8ePoDnStUn04oVvv3eIJ8aKVUw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/govee2mqtt/
|
||||
cp -r assets $out/share/govee2mqtt/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Connect Govee lights and devices to Home Assistant";
|
||||
homepage = "https://github.com/wez/govee2mqtt";
|
||||
changelog = "https://github.com/wez/govee2mqtt/blob/${src.rev}/addon/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
mainProgram = "govee";
|
||||
};
|
||||
}
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ignite-cli";
|
||||
version = "28.1.1";
|
||||
version = "28.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "cli";
|
||||
owner = "ignite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8/YupS16j6+iMt09RO1RZrJNlxfmE27tOD+cYecKnbc=";
|
||||
hash = "sha256-FRujRghSPSc2fq2Eiv4Hco4RIcv3D4zNI82NEhCGFhM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GpRTOjrPF+GS0XfavG7GYG5FcHc8ELxzhminncV2Qgk=";
|
||||
vendorHash = "sha256-cH6zwkRMvUjYb6yh/6S/e4ky8f4GvhCAOnCJMfDTmrE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
26
pkgs/by-name/ma/manix/package.nix
Normal file
26
pkgs/by-name/ma/manix/package.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "manix";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "manix";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-45cb0yO/ypGLcvEgPOkN6Py99yqK09xnCmMOLOOYYSA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast CLI documentation searcher for Nix";
|
||||
homepage = "https://github.com/nix-community/manix";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ iogamaster lecoqjacob ];
|
||||
mainProgram = "manix";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, unzip
|
||||
, pkg-config
|
||||
, libXpm
|
||||
, fltk13
|
||||
, freeimage
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "posterazor";
|
||||
|
|
@ -6,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip";
|
||||
sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5";
|
||||
hash = "sha256-BbujA2ASyqQelb3iFAwgeJC0OhzXqufIa1UD+tFsF7c=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
@ -32,8 +41,9 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "http://posterazor.sourceforge.net/";
|
||||
description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
|
||||
maintainers = [ maintainers.madjar ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.madjar ];
|
||||
mainProgram = "PosteRazor";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pysqlrecon";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tw1sm";
|
||||
repo = "PySQLRecon";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IxIYJo2wG8xqetBqgUOePNWPSx9FaZPhqhOFy3kG6Uk=";
|
||||
hash = "sha256-v6IO5fQLvzJhpMPNaZ+ehmU4NYgRDfnDRwQYv5QVx00=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
34
pkgs/by-name/td/tdl/package.nix
Normal file
34
pkgs/by-name/td/tdl/package.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "tdl";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iyear";
|
||||
repo = "tdl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vKcKHxPwF7kdsEASJ4VunPZ9kVztPq3yH8RnCd9uI9A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-v5okd7PAnA2JsgZ4SqvpZmXOQXSCzl+SwFx9NWo7C/0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/iyear/tdl/pkg/consts.Version=${version}"
|
||||
];
|
||||
|
||||
# Requires network access
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Telegram downloader/tools written in Golang";
|
||||
homepage = "https://github.com/iyear/tdl";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ Ligthiago ];
|
||||
mainProgram = "tdl";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
|
||||
index cdd3b5b..a5a2174 100644
|
||||
--- a/src/plugins/meson.build
|
||||
+++ b/src/plugins/meson.build
|
||||
@@ -63,9 +63,3 @@ if all_nvidia_linux_libs
|
||||
install : true,
|
||||
link_with : libtuxclocker)
|
||||
endif
|
||||
-
|
||||
-shared_library('cpu', 'CPU.cpp', 'Utils.cpp',
|
||||
- include_directories : [incdir, fplus_inc],
|
||||
- install_dir : get_option('libdir') / 'tuxclocker' / 'plugins',
|
||||
- install : true,
|
||||
- link_with : libtuxclocker)
|
||||
|
|
@ -22,13 +22,10 @@ stdenv.mkDerivation {
|
|||
openssl
|
||||
];
|
||||
|
||||
# Build doesn't have a way to disable building the CPU plugin, which is already
|
||||
# provided by 'tuxclocker-plugins'
|
||||
patches = [ ./no-cpu-plugin.patch ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddaemon=false"
|
||||
"-Dgui=false"
|
||||
"-Drequire-nvidia=true"
|
||||
"-Dplugins-cpu=false" # provided by tuxclocker-plugins
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, boost
|
||||
, cmake
|
||||
, gettext
|
||||
, git
|
||||
, libdrm
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -20,7 +19,6 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
git
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "23.12.10";
|
||||
version = "24.02.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-kNO0YHHapoIKAosGvCMUEhjP6FkD/CRNhrv5D3dxgoI=";
|
||||
sha256 = "sha256-IYfyoDoBQOFLGRS6v487GLAdUSJUuscLIUwi65ilu90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "mousepad";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-MLdexhIsQa4XuVaLgtQ2aVJ00+pwkhAP3qMj0XXPqh0=";
|
||||
sha256 = "sha256-A4siNxbTf9ObJJg8inPuH7Lo4dckLbFljV6aPFQxRto=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "ristretto";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-Tor4mA0uSpVCdK6mla1L0JswgURnGPOfkYBR2N1AbL0=";
|
||||
sha256 = "sha256-FKgNKQ2l4FGvEvmppf+RTxMXU6TfsZVFBVii4zr4ASc=";
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-terminal";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-LDfZTZ2EaboIYz+xQNC2NKpJiN8qqfead2XzpKVpL6c=";
|
||||
sha256 = "sha256-9RJmHYT9yYhtyzyTcg3nnD2hlCgENyi/3TNOGUto494=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxslt
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "garcon";
|
||||
version = "4.18.1";
|
||||
version = "4.18.2";
|
||||
|
||||
sha256 = "sha256-0EcmI+C8B7oQl/cpbFeLjof1fnUi09nZAA5uJ0l15V4=";
|
||||
sha256 = "sha256-J9f9MzZ1I9XIyvwuyINkvXDuXY6/MkjlH2Ct4yaEXsY=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "libxfce4ui";
|
||||
version = "4.18.4";
|
||||
version = "4.18.5";
|
||||
|
||||
sha256 = "sha256-HnLmZftvFvQAvmQ7jZCaYAQ5GB0YMjzhqZkILzvifoE=";
|
||||
sha256 = "sha256-Jf+oxdUWXJJmMoJ9kIx9F+ndb2c6bNpf+JOzxpi2Lwo=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection vala ];
|
||||
buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ];
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "libxfce4util";
|
||||
version = "4.18.1";
|
||||
version = "4.18.2";
|
||||
|
||||
sha256 = "sha256-nqASXyHR7wNiNPorlz2ix+Otyir6I9KCCr1vfS6GO8E=";
|
||||
sha256 = "sha256-JQ6biE1gxtB6+LWxRGfbUhgJhhITGhLr+8BxFW4/8SU=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection vala ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erg";
|
||||
version = "0.6.29";
|
||||
version = "0.6.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erg-lang";
|
||||
repo = "erg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sHW0e8a8ZDmcA8u0leIJLxzJLI8guKlMB/u7CFhbyQE=";
|
||||
hash = "sha256-lStTLDXgdaaqyzdzU1V2JnKX8jt27Z1A23fkuZU8dt0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3wrH++IItJQNueJoa5wuzN2ZXWa5OflBItjQxS/XhO0=";
|
||||
cargoHash = "sha256-MsDan3wL9RhH0uhAuq0Lg8IRBXR8a3ooEBx6n2CMAVk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ backendStdenv.mkDerivation (
|
|||
finalAttrs: {
|
||||
|
||||
pname = "nccl-tests";
|
||||
version = "2.13.8";
|
||||
version = "2.13.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg=";
|
||||
hash = "sha256-QYuMBPhvHHVo2ku14jD1CVINLPW0cyiXJkXxb77IxbE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arduino-language-server";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = "arduino-language-server";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RBoDT/KnbQHeuE5WpoL4QWu3gojiNdsi+/NEY2e/sHs=";
|
||||
hash = "sha256-PmPGhbB1HqxZRK+f28SdZNh4HhE0oseYsdJuEAAk90I=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -52,16 +52,16 @@ let
|
|||
name = "arrow-testing";
|
||||
owner = "apache";
|
||||
repo = "arrow-testing";
|
||||
rev = "47f7b56b25683202c1fd957668e13f2abafc0f12";
|
||||
hash = "sha256-ZDznR+yi0hm5O1s9as8zq5nh1QxJ8kXCRwbNQlzXpnI=";
|
||||
rev = "ad82a736c170e97b7c8c035ebd8a801c17eec170";
|
||||
hash = "sha256-wN0dam0ZXOAJ+D8bGDMhsdaV3llI9LsiCXwqW9mR3gQ=";
|
||||
};
|
||||
|
||||
parquet-testing = fetchFromGitHub {
|
||||
name = "parquet-testing";
|
||||
owner = "apache";
|
||||
repo = "parquet-testing";
|
||||
rev = "b2e7cc755159196e3a068c8594f7acbaecfdaaac";
|
||||
hash = "sha256-IFvGTOkaRSNgZOj8DziRj88yH5JRF+wgSDZ5N0GNvjk=";
|
||||
rev = "d69d979223e883faef9dc6fe3cf573087243c28a";
|
||||
hash = "sha256-CUckfNjfDW05crWigzMP5b9UynviXKGZUlIr754OoGU=";
|
||||
};
|
||||
|
||||
aws-sdk-cpp-arrow = aws-sdk-cpp.override {
|
||||
|
|
@ -76,16 +76,16 @@ let
|
|||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "arrow-cpp";
|
||||
version = "14.0.1";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
||||
hash = "sha256-XHDq+xAR+dEkuvsyiv5U9izFuSgLcIDh49Zo94wOQH4=";
|
||||
url = "mirror://apache/arrow/arrow-${finalAttrs.version}/apache-arrow-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Ad0/cOhdm1uTPsksDbik71BKUQX3jS2GIuhCeftFwl0=";
|
||||
};
|
||||
|
||||
sourceRoot = "apache-arrow-${version}/cpp";
|
||||
sourceRoot = "apache-arrow-${finalAttrs.version}/cpp";
|
||||
|
||||
# versions are all taken from
|
||||
# https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt
|
||||
|
|
@ -211,8 +211,8 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals enableS3 [ "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
ARROW_TEST_DATA = lib.optionalString doInstallCheck "${arrow-testing}/data";
|
||||
PARQUET_TEST_DATA = lib.optionalString doInstallCheck "${parquet-testing}/data";
|
||||
ARROW_TEST_DATA = lib.optionalString finalAttrs.doInstallCheck "${arrow-testing}/data";
|
||||
PARQUET_TEST_DATA = lib.optionalString finalAttrs.doInstallCheck "${parquet-testing}/data";
|
||||
GTEST_FILTER =
|
||||
let
|
||||
# Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11398
|
||||
|
|
@ -236,7 +236,7 @@ stdenv.mkDerivation rec {
|
|||
"ExecPlanExecution.StressSourceSinkStopped"
|
||||
];
|
||||
in
|
||||
lib.optionalString doInstallCheck "-${lib.concatStringsSep ":" filteredTests}";
|
||||
lib.optionalString finalAttrs.doInstallCheck "-${lib.concatStringsSep ":" filteredTests}";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
|
@ -244,19 +244,21 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals enableS3 [ minio ]
|
||||
++ lib.optionals enableFlight [ python3 ];
|
||||
|
||||
disabledTests = [
|
||||
# requires networking
|
||||
"arrow-gcsfs-test"
|
||||
"arrow-flight-integration-test"
|
||||
];
|
||||
installCheckPhase =
|
||||
let
|
||||
disabledTests = [
|
||||
# requires networking
|
||||
"arrow-gcsfs-test"
|
||||
"arrow-flight-integration-test"
|
||||
];
|
||||
in
|
||||
''
|
||||
runHook preInstallCheck
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
ctest -L unittest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$'
|
||||
|
||||
ctest -L unittest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$'
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-language development platform for in-memory data";
|
||||
|
|
@ -268,4 +270,4 @@ stdenv.mkDerivation rec {
|
|||
passthru = {
|
||||
inherit enableFlight enableJemalloc enableS3 enableGcs;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
# for passthru.tests
|
||||
, libgit2-glib
|
||||
, python3Packages
|
||||
, gitstatus
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -68,6 +69,7 @@ stdenv.mkDerivation rec {
|
|||
passthru.tests = {
|
||||
inherit libgit2-glib;
|
||||
inherit (python3Packages) pygit2;
|
||||
inherit gitstatus;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
|
|
@ -10,23 +10,30 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-client";
|
||||
version = "0.11";
|
||||
format = "setuptools";
|
||||
version = "0.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-client";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Voc1ME0iGQCMaDfBXDSVnRp8olvId+fLhH8sqHwB2Ak=";
|
||||
hash = "sha256-qs0/TkGZlwsucnkgCBco2Pqr9mf5fZHY7ikMBKff+gA=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
haversine
|
||||
|
|
@ -35,10 +42,8 @@ buildPythonPackage rec {
|
|||
dateparser
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
aioresponses
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -1,37 +1,42 @@
|
|||
{ lib
|
||||
, aio-georss-client
|
||||
, aresponses
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-gdacs";
|
||||
version = "0.8";
|
||||
format = "setuptools";
|
||||
version = "0.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-gdacs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1mpOWd4Z2gTQtRewWfZsfEtmS6i5uMPAMTlC8UpawxM=";
|
||||
hash = "sha256-B0qVCh2u0WleF0iv0o1/d5UIS2kbYCAqCgmNHyCpJ8Q=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aio-georss-client
|
||||
dateparser
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, ebooklib
|
||||
, lxml
|
||||
, pillow
|
||||
|
|
@ -10,18 +11,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "comicon";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "potatoeggy";
|
||||
repo = "comicon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D6nK+GlcG/XqMTH7h7mJcbZCRG2xDHRsnooSTtphDNs=";
|
||||
hash = "sha256-e9YEr8IwttMlj6FOxk+/kw79qiF1N8/e2qusfw3WH00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"lxml"
|
||||
"pillow"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -34,6 +41,7 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "comicon" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/potatoeggy/comicon/releases/tag/v${version}";
|
||||
description = "Lightweight comic converter library between CBZ, PDF, and EPUB";
|
||||
homepage = "https://github.com/potatoeggy/comicon";
|
||||
license = licenses.agpl3Only;
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-pubsub";
|
||||
version = "2.19.0";
|
||||
version = "2.19.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-apjDP361994q5S76BZsrX3WyzNnw8R8u3O/dqNFOQlw=";
|
||||
hash = "sha256-wQ2V66+QP5I7FKqOxbfICRYTjt8pnGWhwalDH9VmXSU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, google-cloud-core
|
||||
, google-cloud-testutils
|
||||
, grpc-google-iam-v1
|
||||
, grpc-interceptor
|
||||
, libcst
|
||||
, mock
|
||||
, proto-plus
|
||||
|
|
@ -19,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.41.0";
|
||||
version = "3.42.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jK2hHdYdxwsEmk/aDp7ArXZwZbhEloqIuLJ2ZwMs9YI=";
|
||||
hash = "sha256-E7arqGBZ/QPzbAMsQUMnTWiD054tMr91PgrT0tzQjhI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,6 +39,7 @@ buildPythonPackage rec {
|
|||
google-api-core
|
||||
google-cloud-core
|
||||
grpc-google-iam-v1
|
||||
grpc-interceptor
|
||||
proto-plus
|
||||
protobuf
|
||||
sqlparse
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, grpcio
|
||||
|
|
@ -12,8 +11,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpc-interceptor";
|
||||
version = "0.15.3";
|
||||
format = "pyproject";
|
||||
version = "0.15.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -21,18 +20,9 @@ buildPythonPackage rec {
|
|||
owner = "d5h-foss";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tTi1X1r7584ZXa12eLp2G/Am8G6Dnd18eE5wF/Lp/EY=";
|
||||
hash = "sha256-GJkVCslPXShJNDrqhFtCsAK5+VaG8qFJo0RQTsiMIFY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/d5h-foss/grpc-interceptor/pull/44
|
||||
(fetchpatch {
|
||||
name = "replace-poetry-with-poetry-core.patch";
|
||||
url = "https://github.com/d5h-foss/grpc-interceptor/commit/916cb394acd8dd7abb4f5edcb4e88aee961a32d0.patch";
|
||||
hash = "sha256-W2SF2zyjusTxgvCxBDLpisD03bofzDug1eyd4FLJmKs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, setuptools
|
||||
, boost
|
||||
, eigen
|
||||
, gmp
|
||||
|
|
@ -19,37 +20,44 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gudhi";
|
||||
version = "3.8.0";
|
||||
format = "setuptools";
|
||||
version = "3.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GUDHI";
|
||||
repo = "gudhi-devel";
|
||||
rev = "tags/gudhi-release-${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-f2ajy4muG9vuf4JarGWZmdk/LF9OYd2KLSaGyY6BQrY=";
|
||||
hash = "sha256-VL6RIPe8a2/cUHnHOql9e9EUMBB9QU311kMCaMZTbGI=";
|
||||
};
|
||||
|
||||
patches = [ ./remove_explicit_PYTHONPATH.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake numpy cython pybind11 matplotlib ];
|
||||
nativeBuildInputs = [ cmake numpy cython pybind11 matplotlib setuptools ];
|
||||
buildInputs = [ boost eigen gmp cgal mpfr ]
|
||||
++ lib.optionals enableTBB [ tbb ];
|
||||
propagatedBuildInputs = [ numpy scipy ];
|
||||
nativeCheckInputs = [ pytest ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_GUDHI_PYTHON=ON"
|
||||
"-DPython_ADDITIONAL_VERSIONS=3"
|
||||
(lib.cmakeBool "WITH_GUDHI_PYTHON" true)
|
||||
(lib.cmakeFeature "Python_ADDITIONAL_VERSIONS" "3")
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace src/python/CMakeLists.txt \
|
||||
--replace '"''${GUDHI_PYTHON_PATH_ENV}"' ""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cd src/python
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
rm -r gudhi
|
||||
${cmake}/bin/ctest --output-on-failure
|
||||
ctest --output-on-failure
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "gudhi" "gudhi.hera" "gudhi.point_cloud" "gudhi.clustering" ];
|
||||
|
|
|
|||
|
|
@ -1,195 +0,0 @@
|
|||
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
|
||||
index 86a409b6..09544fb5 100644
|
||||
--- a/src/python/CMakeLists.txt
|
||||
+++ b/src/python/CMakeLists.txt
|
||||
@@ -329,15 +329,6 @@ if(PYTHONINTERP_FOUND)
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/setup.py" "build_ext" "--inplace")
|
||||
|
||||
- add_custom_target(python ALL DEPENDS gudhi.so
|
||||
- COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests")
|
||||
-
|
||||
- # Path separator management for windows
|
||||
- if (WIN32)
|
||||
- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR};$ENV{PYTHONPATH}")
|
||||
- else(WIN32)
|
||||
- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:$ENV{PYTHONPATH}")
|
||||
- endif(WIN32)
|
||||
# Documentation generation is available through sphinx - requires all modules
|
||||
# Make it first as sphinx test is by far the longest test which is nice when testing in parallel
|
||||
if(SPHINX_PATH)
|
||||
@@ -358,13 +349,13 @@ if(PYTHONINTERP_FOUND)
|
||||
# sphinx target requires gudhi.so, because conf.py reads gudhi version from it
|
||||
add_custom_target(sphinx
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx
|
||||
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so"
|
||||
COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM)
|
||||
add_test(NAME sphinx_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest)
|
||||
# Set missing or not modules
|
||||
set(GUDHI_MODULES ${GUDHI_MODULES} "python-documentation" CACHE INTERNAL "GUDHI_MODULES")
|
||||
@@ -408,13 +399,13 @@ if(PYTHONINTERP_FOUND)
|
||||
# Cubical
|
||||
add_test(NAME periodic_cubical_complex_barcode_persistence_from_perseus_file_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py"
|
||||
--no-barcode -f ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt)
|
||||
|
||||
add_test(NAME random_cubical_complex_persistence_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/random_cubical_complex_persistence_example.py"
|
||||
10 10 10)
|
||||
|
||||
@@ -426,7 +417,7 @@ if(PYTHONINTERP_FOUND)
|
||||
|
||||
add_test(NAME cubical_complex_sklearn_itf_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/cubical_complex_sklearn_itf.py")
|
||||
endif()
|
||||
|
||||
@@ -435,7 +426,7 @@ if(PYTHONINTERP_FOUND)
|
||||
# Bottleneck and Alpha
|
||||
add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py"
|
||||
-f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3)
|
||||
endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 5.1.0)
|
||||
@@ -443,7 +434,7 @@ if(PYTHONINTERP_FOUND)
|
||||
# Tangential
|
||||
add_test(NAME tangential_complex_plain_homology_from_off_file_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/tangential_complex_plain_homology_from_off_file_example.py"
|
||||
--no-diagram -i 2 -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off)
|
||||
|
||||
@@ -452,13 +443,13 @@ if(PYTHONINTERP_FOUND)
|
||||
# Witness complex
|
||||
add_test(NAME euclidean_strong_witness_complex_diagram_persistence_from_off_file_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py"
|
||||
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2)
|
||||
|
||||
add_test(NAME euclidean_witness_complex_diagram_persistence_from_off_file_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py"
|
||||
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2)
|
||||
|
||||
@@ -467,7 +458,7 @@ if(PYTHONINTERP_FOUND)
|
||||
# Bottleneck
|
||||
add_test(NAME bottleneck_basic_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/bottleneck_basic_example.py")
|
||||
|
||||
add_gudhi_py_test(test_bottleneck_distance)
|
||||
@@ -479,26 +470,26 @@ if(PYTHONINTERP_FOUND)
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
|
||||
add_test(NAME cover_complex_nerve_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py"
|
||||
-f human.off -c 2 -r 10 -g 0.3)
|
||||
|
||||
add_test(NAME cover_complex_coordinate_gic_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py"
|
||||
-f human.off -c 0 -v)
|
||||
|
||||
add_test(NAME cover_complex_functional_gic_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py"
|
||||
-o lucky_cat.off
|
||||
-f lucky_cat_PCA1 -v)
|
||||
|
||||
add_test(NAME cover_complex_voronoi_gic_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py"
|
||||
-f human.off -n 700 -v)
|
||||
|
||||
@@ -506,15 +497,15 @@ if(PYTHONINTERP_FOUND)
|
||||
# Alpha
|
||||
add_test(NAME alpha_complex_from_points_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py")
|
||||
add_test(NAME alpha_complex_from_generated_points_on_sphere_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_generated_points_on_sphere_example.py")
|
||||
add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py"
|
||||
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off)
|
||||
add_gudhi_py_test(test_alpha_complex)
|
||||
@@ -532,19 +523,19 @@ if(PYTHONINTERP_FOUND)
|
||||
# Rips
|
||||
add_test(NAME rips_complex_diagram_persistence_from_distance_matrix_file_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py"
|
||||
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/distance_matrix/lower_triangular_distance_matrix.csv -s , -e 12.0 -d 3)
|
||||
|
||||
add_test(NAME rips_complex_diagram_persistence_from_off_file_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_off_file_example.py
|
||||
--no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -e 0.25 -d 3)
|
||||
|
||||
add_test(NAME rips_complex_from_points_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_from_points_example.py)
|
||||
|
||||
add_gudhi_py_test(test_rips_complex)
|
||||
@@ -552,7 +543,7 @@ if(PYTHONINTERP_FOUND)
|
||||
# Simplex tree
|
||||
add_test(NAME simplex_tree_example_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/simplex_tree_example.py)
|
||||
|
||||
add_gudhi_py_test(test_simplex_tree)
|
||||
@@ -565,7 +556,7 @@ if(PYTHONINTERP_FOUND)
|
||||
# Witness
|
||||
add_test(NAME witness_complex_from_nearest_landmark_table_py_test
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
|
||||
+ COMMAND ${CMAKE_COMMAND} -E env
|
||||
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/witness_complex_from_nearest_landmark_table.py)
|
||||
|
||||
add_gudhi_py_test(test_witness_complex)
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, beautifulsoup4
|
||||
, comicon
|
||||
, feedparser
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "mandown";
|
||||
version = "1.7.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "potatoeggy";
|
||||
|
|
@ -29,6 +30,12 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pillow"
|
||||
"typer"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -50,13 +57,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace 'typer = "^0.7.0"' 'typer = "^0"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "mandown" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/potatoeggy/mandown/releases/tag/v${version}";
|
||||
description = "Comic/manga/webtoon downloader and CBZ/EPUB/MOBI/PDF converter";
|
||||
homepage = "https://github.com/potatoeggy/mandown";
|
||||
license = licenses.agpl3Only;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mujoco";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
# in the project's CI.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ESEnPeL79O0wnllEo9s50B84WyINIOeMRg7E78BpRbM=";
|
||||
hash = "sha256-U1MLwakZA/P9Sx6ZgYzDj72ZEXANspssn8g58jv6y7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake setuptools ];
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, hatchling
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.159";
|
||||
version = "2.1.162";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hBlwfyQ1PbD6AyCsra2yZwt0x8+iGtDisU9coTSJRZI=";
|
||||
hash = "sha256-XeAOEhmNEACr+KrIYaclDH7EW2XQeobIAQvm99hn24M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
hatchling
|
||||
];
|
||||
|
||||
# A few more dependencies I don't want to handle right now...
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.15.7";
|
||||
version = "4.15.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jI/yQuyPfZNZf6yG35rdIYmnJmRuNYUNpEJBNzDMnrY=";
|
||||
hash = "sha256-mKn2SLECtJwUdBS7u8NAyIq6wlk+0WNWnDv27AVcysY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.10.0.20240205";
|
||||
version = "0.10.0.20240207";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zHqwViwlGAqlOuyP47SkcxKu+vFQFiAfWT0N+UYozqE=";
|
||||
hash = "sha256-P9VC6y7hhhIM7+DCtLDDIWOwLQNdvdOqgLg/h+JAnhs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "puremagic";
|
||||
version = "1.15";
|
||||
version = "1.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "cdgriffith";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WnqDrVPTlNxz3SDt1wLdZmxtj0Vh6gLHDJlYGEHHxsg=";
|
||||
hash = "sha256-Iyf/Vf1uqdtHlaP9Petpp88aIGCGmHu//cH6bindL6c=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-dmidecode";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "py_dmidecode";
|
||||
inherit version;
|
||||
hash = "sha256-nMy/jOlg7yUPfGF27MN0NyVM0vuTIBuJTV2GKNP13UA=";
|
||||
hash = "sha256-pS1fRWuWLnXuNEGYXU/j1njC8THWQOHbnVOF9+c13Cw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
, pytestCheckHook
|
||||
, pytest-lazy-fixture
|
||||
, pkg-config
|
||||
, scipy
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, oldest-supported-numpy
|
||||
|
|
@ -53,10 +52,12 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
numpy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
cloudpickle
|
||||
fsspec
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-md-report";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8qLcbMhD+mTLH5veweAg56G067H4AnDQIjywINwJaCE=";
|
||||
hash = "sha256-WzPspBVcrtcDqZI+PuAttfI7YBKC5DW5IM+Y7iUdQFI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.206.0";
|
||||
version = "2.207.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aKLv8bXH1lq6yBeFsR2odtTo4sbaHlSyeSUnKdIzW9Q=";
|
||||
hash = "sha256-nSFBx2s6vy5Ug2tBiPqNu4Q29LGW2LijoDKlC6m4CL4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.3.9";
|
||||
version = "1.3.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "lendy007";
|
||||
repo = "skodaconnect";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7QDelJzyRnYNqVP9IuREpCm5s+qJ8cxSEn1YcqnYepA=";
|
||||
hash = "sha256-H45rL9GFuTnP5VP0cRyqlmWJmX1Zvh7A7JcSKgcZCwA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy";
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zt9JJ78NP+x3OmzkjV0skb2wL+08fV7Ae9uHPxEm8aA=";
|
||||
hash = "sha256-mSZQKPvcbhIknFMwXkYfeaEDY3sOaGbCivDkY2X3UeE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ buildDotnetModule rec {
|
|||
homepage = "https://github.com/fsharp/FsAutoComplete";
|
||||
changelog = "https://github.com/fsharp/FsAutoComplete/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ gbtb mdarocha ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
6
pkgs/development/tools/fsautocomplete/deps.nix
generated
6
pkgs/development/tools/fsautocomplete/deps.nix
generated
|
|
@ -84,6 +84,8 @@
|
|||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.26"; sha256 = "1d8nkz24vsm0iy2xm8y5ak2q1w1p99dxyz0y26acs6sfk2na0vm6"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "1za8lc52m4z54d68wd64c2nhzy05g3gx171k5cdlx73fbymiys9z"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "1zpbmz6z8758gwywzg0bac8kx9x39sxxc9j4a4r2jl74l9ssw4vm"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1i8ydlwjzk7j0mzvn0rpljxfp1h50zwaqalnyvfxai1fwgigzgw5"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "02src68hd3213sd1a2ms1my7i92knfmdxclvv90il9cky2zsq8kw"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; })
|
||||
(fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; sha256 = "09hs74nr0kv83wc1way9x7vq3nmxbr2s4vdy99hx78kj25pylcr7"; })
|
||||
|
|
@ -126,9 +128,13 @@
|
|||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.26"; sha256 = "19y6c6v20bgf7x7rrh4rx9y7s5fy8vp5m4j9b6gi1wp4rpb5mza4"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.26"; sha256 = "0p7hhidaa3mnyiwnsijwy8578v843x8hh99255s69qwwyld6falv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.26"; sha256 = "1mq11xsv9g1vsasp6k80y7xlvwi9hrpk5dgm773fvy8538s01gfv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.26"; sha256 = "1chac9b4424ihrrnlzvc7qz6j4ymfjyv4kzyazzzw19yhymdkh2s"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.26"; sha256 = "12gb52dhg5h9hgnyqh1zgj2w46paxv2pfh33pphl9ajhrdr7hlsb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "164hfrwqz5dxcbb441lridk4mzcqmarb0b7ckgvqhsvpawyjw88v"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "0islayddpnflviqpbq4djc4f3v9nhsa2y76k5x6il3csq5vdw2hq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1acn5zw1pxzmcg3c0pbf9hal36fbdh9mvbsiwra7simrk7hzqpdc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "00f9l9dkdz0zv5csaw8fkm6s8ckrj5n9k3ygz12daa22l3bcn6ii"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "7.0.4"; sha256 = "0afmivk3m0hmwsiqnl87frzi7g57aiv5fwnjds0icl66djpb6zsm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; })
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gqlgenc";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamashou";
|
||||
repo = "gqlgenc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KAUdddVjX1yQLSqnvSAoYPaLL8N8SOfR/gvQ5In4Z/Y=";
|
||||
sha256 = "sha256-AzkLNdT9PC82NLvPH+wYu0Z5VSxYtTYMaiVtAPAvfOo=";
|
||||
};
|
||||
|
||||
excludedPackages = [ "example" ];
|
||||
|
||||
vendorHash = "sha256-6iwNykvW1m+hl6FzMNbvvPpBNp8OQn2/vfJLmAj60Mw=";
|
||||
vendorHash = "sha256-lJ3oYDW7BJnguIJ/TzZSUgSuoDIKmb6hdXOKENtmk6M=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Go tool for building GraphQL client with gqlgen";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "astyle";
|
||||
version = "3.4.11";
|
||||
version = "3.4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-FbIrxsvAOMzYzvOATv7ALzXG8lOLdck7x/duTemKupI=";
|
||||
hash = "sha256-B3RZsp9zhvJWnBQsaKW2YHaAsMvaAhAgn/6m/w9atg4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "runme";
|
||||
version = "2.2.2";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stateful";
|
||||
repo = "runme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JEKfUrXCN2cvoVs2bScq1v/DfmqaUoew3PyGnNaTKN8=";
|
||||
hash = "sha256-CEJsLBfLMWEQV6Q9TMy1Igdmn45v8vV0rxOMmFW/sb8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+g6vEgA+vbGzLnotmhk0gp1IcY3zpF71TdoB8d84W6A=";
|
||||
vendorHash = "sha256-QoZzEq1aC7cjY/RVp5Z5HhSuTFf2BSYQnfg0jSaeTJU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "regclient";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
tag = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regclient";
|
||||
repo = "regclient";
|
||||
rev = tag;
|
||||
sha256 = "sha256-axsqz+STfymiyoi90r/pFhe8FK/Gu2Lbzv7K2/uQZlk=";
|
||||
sha256 = "sha256-GT8SJg24uneEbV8WY8Wl2w3lxqLJ7pFCa+654ksBfG4=";
|
||||
};
|
||||
vendorHash = "sha256-A7IVbOYF4vNz3lzdhVEgx+sOe1GoaXAWGyvhj6xwagU=";
|
||||
vendorHash = "sha256-cxydurN45ovb4XngG4L/K6L+QMfsaRBZhfLYzKohFNY=";
|
||||
|
||||
outputs = [ "out" ] ++ bins;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "semantic-release";
|
||||
version = "23.0.0";
|
||||
version = "23.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "semantic-release";
|
||||
repo = "semantic-release";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UXh/3ziNuTvLjd54l7oUOZgbu0+Hy4+a5TUp9dEvAJw=";
|
||||
hash = "sha256-syxkKAPlxaVZNoeEErQbPJ/7QHGAd+DlNGWQVafahdI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RgqerFVG0qdJ52zTvsgtczGcdKw6taiIpgA2LHPELws=";
|
||||
npmDepsHash = "sha256-hfHFZJcMT/+ZD/Zgpv2B2ng5AbL7tQrzHGA5nFbTc/A=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,14 +16,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = cfg.sha256.${pname};
|
||||
};
|
||||
|
||||
patches = [
|
||||
# batman-adv: compat: Fix skb_vlan_eth_hdr conflict in stable kernels
|
||||
(fetchpatch2 {
|
||||
url = "https://git.open-mesh.org/batman-adv.git/commitdiff_plain/be69e50e8c249ced085d41ddd308016c1c692174?hp=74d3c5e1c682a9efe31b75e8986668081a4b5341";
|
||||
sha256 = "sha256-yfEiU74wuMSKal/6mwzgdccqDMEv4P7CkAeiSAEwvjA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{
|
||||
version = "2023.3";
|
||||
version = "2024.0";
|
||||
|
||||
# To get these, run:
|
||||
#
|
||||
# ```
|
||||
# for tool in alfred batctl batman-adv; do
|
||||
# nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2023.3/$tool-2023.3.tar.gz --type sha256 | xargs nix hash to-sri --type sha256
|
||||
# nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.0/$tool-2024.0.tar.gz --type sha256 | xargs nix hash to-sri --type sha256
|
||||
# done
|
||||
# ```
|
||||
sha256 = {
|
||||
alfred = "sha256-rVrUFJ+uz351MCpXeqpnOxz8lAXSAksrSpFjuscMjk8=";
|
||||
batctl = "sha256-mswxFwkwwXl8OHY7h73/iAVMNNHwEvu4EAaCc/7zEhI=";
|
||||
batman-adv = "sha256-98bFPlk0PBYmQsubRPEBZ2XUv1E+A5ACvmEremweo2w=";
|
||||
alfred = "sha256-0CmkNjirFnceX3HhNLyEPRcT10BBxlvNoYox0Y9VMb0=";
|
||||
batctl = "sha256-doU+hyAa9jxBHbFS/QxiWnKalzMRWJfRMxYE4sWmfH0=";
|
||||
batman-adv = "sha256-YREGl7V5n2RqKoKk3Pl/rtS7EqfMQ79Gg9LE3k9rQOc=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }:
|
||||
|
||||
let
|
||||
version = "3.5.11";
|
||||
version = "3.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etcd-io";
|
||||
repo = "etcd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OjAWi5EXy1d1O6HLBzHcSfeCNmZZLNtrQXpTJ075B0I=";
|
||||
hash = "sha256-Z2WXNzFJYfRQCldUspQjUR5NyUzCCINycuEXWaTn4vU=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorHash = "sha256-1/ma737hGdek+263w5OuO5iN5DTA8fpb6m0Fefyww20=";
|
||||
vendorHash = "sha256-S5cEIV4hKRjn9JFEKWBiSEPytHtVacsSnG6T8dofgyk=";
|
||||
|
||||
modRoot = "./server";
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ let
|
|||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorHash = "sha256-AMN8iWTIFeT0HLqxYrp7sieT0nEKBNwFXV9mZG3xG5I=";
|
||||
vendorHash = "sha256-Vgp44Kg6zUDYVJU6SiYd8ZEcAWqKPPTsqYafcfk89Cc=";
|
||||
|
||||
modRoot = "./etcdutl";
|
||||
};
|
||||
|
|
@ -55,7 +55,7 @@ let
|
|||
|
||||
inherit CGO_ENABLED meta src version;
|
||||
|
||||
vendorHash = "sha256-zwafVpNBvrRUbL0qkDK9TOyo8KCiGjpZhvdUrgklG5Y=";
|
||||
vendorHash = "sha256-PZLsekZzwlGzccCirNk9uUj70Ue5LMDs6LMWBI9yivs=";
|
||||
|
||||
modRoot = "./etcdctl";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
|
||||
version = "0.13.0";
|
||||
version = "0.13.2";
|
||||
|
||||
web-assets = fetchurl {
|
||||
url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
|
||||
hash = "sha256-aPxjfe+0f4hUBfwBH67LsR1/Kv/42sPhlHwmVmDfp30=";
|
||||
hash = "sha256-Iyqn0/VyigmOhlyyz1NfvNIXmWtF617QbWzM2c7jHWw=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+/x3CAGF/cjK1/7fHgC8EzlGR/Xmq3aFL5Ogc/QZCpA=";
|
||||
hash = "sha256-VQnE4Xff4gtjQ6V2B42zK8UjosBWEMgcL/3Q8S0wc5Q=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
{
|
||||
adaptive_lighting = callPackage ./adaptive_lighting {};
|
||||
|
||||
emporia_vue = callPackage ./emporia_vue {};
|
||||
|
||||
govee-lan = callPackage ./govee-lan {};
|
||||
|
||||
gpio = callPackage ./gpio {};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildHomeAssistantComponent
|
||||
, pyemvue
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "presto8";
|
||||
domain = "emporia_vue";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magico13";
|
||||
repo = "ha-emporia-vue";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6NrRuBjpulT66pVUfW9ujULL5HSzfgyic1pKEBRupNA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyemvue
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace custom_components/emporia_vue/manifest.json --replace-fail 'pyemvue==0.17.1' 'pyemvue>=0.17.1'
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reads data from the Emporia Vue energy monitor into Home Assistant";
|
||||
homepage = "https://github.com/magico13/ha-emporia-vue";
|
||||
changelog = "https://github.com/magico13/ha-emporia-vue/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ presto8 ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
From de330efaf02ed66d6641ab3bb55eed4bcfad430b Mon Sep 17 00:00:00 2001
|
||||
From: Ilan Joselevich <personal@ilanjoselevich.com>
|
||||
Date: Sun, 14 Jan 2024 23:53:12 +0200
|
||||
Subject: [PATCH] fix warnings for rust v1.75
|
||||
|
||||
---
|
||||
server/lib/src/idm/authsession.rs | 4 ++--
|
||||
server/testkit/tests/integration.rs | 5 ++---
|
||||
server/web_ui/login_flows/src/oauth2.rs | 3 +--
|
||||
unix_integration/nss_kanidm/src/lib.rs | 3 +--
|
||||
4 files changed, 6 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/server/lib/src/idm/authsession.rs b/server/lib/src/idm/authsession.rs
|
||||
index 734864f0d..c65b88494 100644
|
||||
--- a/server/lib/src/idm/authsession.rs
|
||||
+++ b/server/lib/src/idm/authsession.rs
|
||||
@@ -3,7 +3,7 @@
|
||||
//! factor to assert that the user is legitimate. This also contains some
|
||||
//! support code for asynchronous task execution.
|
||||
use std::collections::BTreeMap;
|
||||
-pub use std::collections::BTreeSet as Set;
|
||||
+
|
||||
use std::convert::TryFrom;
|
||||
use std::fmt;
|
||||
use std::time::Duration;
|
||||
@@ -1237,7 +1237,7 @@ impl AuthSession {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
- pub use std::collections::BTreeSet as Set;
|
||||
+
|
||||
use std::str::FromStr;
|
||||
use std::time::Duration;
|
||||
|
||||
diff --git a/server/testkit/tests/integration.rs b/server/testkit/tests/integration.rs
|
||||
index e6879b44b..472022892 100644
|
||||
--- a/server/testkit/tests/integration.rs
|
||||
+++ b/server/testkit/tests/integration.rs
|
||||
@@ -2,12 +2,11 @@
|
||||
|
||||
use std::process::Output;
|
||||
|
||||
-use tempfile::tempdir;
|
||||
+
|
||||
|
||||
use kanidm_client::KanidmClient;
|
||||
use kanidmd_testkit::{
|
||||
- login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_USER,
|
||||
- NOT_ADMIN_TEST_USERNAME,
|
||||
+ login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD,
|
||||
};
|
||||
use testkit_macros::cli_kanidm;
|
||||
|
||||
diff --git a/server/web_ui/login_flows/src/oauth2.rs b/server/web_ui/login_flows/src/oauth2.rs
|
||||
index a41e3083f..d735a7b4d 100644
|
||||
--- a/server/web_ui/login_flows/src/oauth2.rs
|
||||
+++ b/server/web_ui/login_flows/src/oauth2.rs
|
||||
@@ -2,8 +2,7 @@ use gloo::console;
|
||||
use kanidm_proto::constants::uri::{OAUTH2_AUTHORISE, OAUTH2_AUTHORISE_PERMIT};
|
||||
use kanidm_proto::constants::{APPLICATION_JSON, KOPID};
|
||||
pub use kanidm_proto::oauth2::{
|
||||
- AccessTokenRequest, AccessTokenResponse, AuthorisationRequest, AuthorisationResponse,
|
||||
- CodeChallengeMethod, ErrorResponse,
|
||||
+ AuthorisationRequest, AuthorisationResponse,
|
||||
};
|
||||
use kanidmd_web_ui_shared::constants::{CONTENT_TYPE, CSS_ALERT_DANGER, URL_OAUTH2};
|
||||
use kanidmd_web_ui_shared::utils::{do_alert_error, do_footer, window};
|
||||
diff --git a/unix_integration/nss_kanidm/src/lib.rs b/unix_integration/nss_kanidm/src/lib.rs
|
||||
index ef13192b9..27e3321a8 100644
|
||||
--- a/unix_integration/nss_kanidm/src/lib.rs
|
||||
+++ b/unix_integration/nss_kanidm/src/lib.rs
|
||||
@@ -20,5 +20,4 @@ extern crate lazy_static;
|
||||
#[cfg(target_family = "unix")]
|
||||
mod implementation;
|
||||
|
||||
-#[cfg(target_family = "unix")]
|
||||
-pub use implementation::*;
|
||||
+
|
||||
--
|
||||
2.42.0
|
||||
1773
pkgs/servers/kanidm/Cargo.lock
generated
1773
pkgs/servers/kanidm/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -19,27 +19,19 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.1.0-rc.15";
|
||||
version = "1.1.0-rc.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
# Latest 1.1.0-rc.15 tip
|
||||
rev = "4d250f817dbd24d77f72427bb93ef3a367a553c6";
|
||||
hash = "sha256-cXPqTIDHMWcsRFi1/u8lIpwk2m6rh4C70IwVky7B2qs=";
|
||||
rev = version;
|
||||
hash = "sha256-UavMiHe91UrCZfmG6b+yhdduOY2eKMev9HSjtXq1Tlw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# TODO: Remove in the next update
|
||||
# or when https://github.com/kanidm/kanidm/commit/dbf476fe5ea2c120dff9a85e552be9f898c69ce7 is backported
|
||||
./0001-fix-warnings-for-rust-v1.75.patch
|
||||
];
|
||||
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"base64urlsafedata-0.1.3" = "sha256-JLUxLQCwZgxCmXt636baZYo8nQW/ZfHZOqnOIrIks2s=";
|
||||
"base64urlsafedata-0.1.3" = "sha256-lYVWuKqF4c34LpFmTIg98TEXIlP4dHen0XkGnLOiq8Q=";
|
||||
"sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "23.1.7";
|
||||
version = "23.1.14";
|
||||
pname = "cockroachdb";
|
||||
|
||||
# For several reasons building cockroach from source has become
|
||||
|
|
@ -17,11 +17,11 @@ let
|
|||
srcs = {
|
||||
aarch64-linux = fetchzip {
|
||||
url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-arm64.tgz";
|
||||
hash = "sha256-73qJL3o328NckH6POXv+AUvlAJextb31Vs8NGdc8dwE=";
|
||||
hash = "sha256-cwczzmSKKQs/DN6WZ/FF6nJC82Pu47akeDqWdBMgdz0=";
|
||||
};
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-amd64.tgz";
|
||||
hash = "sha256-FL/zDrl+QstBp54LE9/SbIfSPorneGZSef6dcOQJbSo=";
|
||||
hash = "sha256-goCBE+zv9KArdoMsI48rlISurUM0bL/l1OEYWQKqzv0=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.35.2";
|
||||
version = "1.35.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-AesGq2pWb8e2CJxTmP7RmtNYoAsXLAWp65eUjfjBK/A=";
|
||||
hash = "sha256-pj+8BiEcR8Z88J3xxEa4IRBlt9Lv7IoSrKAQ6Y5oydI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9mNUOidUmwOA+bFC8+pCerZ7JEYfQhYUM8D/WBW8IaE=";
|
||||
npmDepsHash = "sha256-15aZyICTRq6DvW2arKtdT+jXDyGtVD7ncer8e4d+03E=";
|
||||
|
||||
nodejs = nodejs_18;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.75.0";
|
||||
version = "1.76.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9BGcP35nTEHccDKLIBNgZbU2xjtFAKtEHLRt8kTlgv0=";
|
||||
sha256 = "sha256-mE1ELXMTQc5JU3d6JLuH4rm1+gfSQH4V29yJ9IkYOXU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.49.0";
|
||||
version = "0.49.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Kx+84kI/8KOOz2p7xGvjOSyMa1Co9u5c0lWOtfi8SVE=";
|
||||
hash = "sha256-+wgnj7mDIJ5UPGfD7vogdcbUeBdvTenL/a0Ew4CfuvE=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-Ldv71C4d9/IO1u+eDKKTHc0pjY8lfnIjQZ57IMWv7Qk=";
|
||||
vendorHash = "sha256-IL3FHgOYQYJIqJKr2eEeM/NzO+SeYucGSNUUY62kHNA=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -38,8 +38,7 @@ buildPythonApplication rec {
|
|||
stringcase
|
||||
];
|
||||
|
||||
# Current releases do not include tests.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alunduil/zfs-replicate";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "remote-touchpad";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unrud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-usJAiGjUGGO4Gb9LMGWR6mG3r8C++llteqn5WpwqqFk=";
|
||||
sha256 = "sha256-LytZBVubsGajx4hFYwP3MwHkAW7LlIr77aVLpeHwWxU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libXi libXrandr libXt libXtst ];
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.32.0";
|
||||
version = "1.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CFrWX40VpkMySDYoci+i7CrypT/dIW3rg/jzRU5V5Tc=";
|
||||
hash = "sha256-k8rBf1kSeumtOHixJR9g90q+u5eIL0584fvTK/Qg/FU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QCCTqP3GNfg/zRXqjpDSnFSwEF0116qtSZ0yYkLbjgQ=";
|
||||
cargoHash = "sha256-MxWtPc1C+L5ZSPOyXwxzdAWe5WbZiPW+Zfv1P1j73JQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "phrase-cli";
|
||||
version = "2.21.0";
|
||||
version = "2.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phrase";
|
||||
repo = "phrase-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-l6leu3U5VFTx1IJjiQo5F+96YddLWBaq5npcbXCUSLA=";
|
||||
sha256 = "sha256-I+ETZhYOd8AMiFf7aLME9FiNHFNfvjGAjSuOjxdkJc8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-U/54Kv7F2ww6gzB9AIAa4Mf6UgWIJyFBbqj6LKdPF3A=";
|
||||
vendorHash = "sha256-aabTjk6MJy6wnpGVTL3J7qMxvU1SfAd+lPOH5HUPkg4=";
|
||||
|
||||
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "upterm";
|
||||
version = "0.12.0";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owenthereal";
|
||||
repo = "upterm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ljiy23qZTe81qaRTgrpuAdZqdOT8t8+cTqXLpKo5yFc=";
|
||||
hash = "sha256-GpD8OUZWN2myADHjpIBUzu2adkE9eFLENxpybX+k9Zg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hXmcgLNzVkU3RC3rj9I+/GlXyxbvPFsoFvVSLJTUHMM=";
|
||||
vendorHash = "sha256-Rh3xgxaCPj9CbiNy8AycuCPvD/HCiLohcdiCQwPduDM=";
|
||||
|
||||
subPackages = [ "cmd/upterm" "cmd/uptermd" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zf";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natecraddock";
|
||||
repo = "zf";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-qzGr72EnWlGZgd7/r+8Iv+1i/Q9qvWpf/cgkr+TrgkE=";
|
||||
hash = "sha256-JPv/59ELh+CS1/akuLNy0qSimMEJsypPO8hiHFAOirI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gvproxy";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "gvisor-tap-vsock";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7WV/PHuZwRnhENolvCAdl9QIQ56B3IvH3n4Db1BvG1o=";
|
||||
hash = "sha256-7j/0VuiHjazsPnyQ4NbmvXX1O/NbeB9l6HfmTRZyAW8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mailutils";
|
||||
version = "3.16";
|
||||
version = "3.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-BB0VjTCMA3YYQ4jpyTbPqEGlHNwl1Nt1mEp3Gj+gAsA=";
|
||||
hash = "sha256-+km6zsN1Zv5S+IIh04cWc6Yzru4M2SPMOo5lu+8rhOk=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "redli";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBM-Cloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Tux4GsYG3DlJoV10Ahb+X+8mpkchLchbh+PCgRD0kUA=";
|
||||
hash = "sha256-DKARqhoSaTQEUm+xUwAFFLR65q1L+bab7+50LONwvEQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slirp4netns";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rootless-containers";
|
||||
repo = "slirp4netns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TQi2Ok58VbKl3iaMygBL16NZukvVkSSmyVpGT2A1IJQ=";
|
||||
sha256 = "sha256-6kfL0ZjXzcyZl3remLi25RMLWCpg+a8EHC1M5LJE4a4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
Security,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "manix";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "lecoqjacob";
|
||||
rev = "${version}";
|
||||
hash = "sha256-kTQbeOIGG1HmbsXKfXw5yCZ49kGufbGiCkkIRMTwcsg=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [Security];
|
||||
cargoSha256 = "sha256-7SHUi1qH9Dr4Oi7A6gRmZqhAIr8RzLNU1l1x4WGtQYI=";
|
||||
|
||||
meta = with lib; {
|
||||
license = [licenses.mpl20];
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/lecoqjacob/manix";
|
||||
description = "A Fast Documentation Searcher for Nix";
|
||||
maintainers = [maintainers.lecoqjacob];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "emplace";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tversteeg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vi4X5P9ey6JkASiDFMCrJjnJW4vsw0d+GoItXTLzYzc=";
|
||||
sha256 = "sha256-gq9JapddDCllczT7Xb71pui3ywbS/ArrjhIU6XfM0B8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wcyfe6YWuRKJzI4dhRJr0tWW830oDe8IPhtWk7zn0Cc=";
|
||||
cargoHash = "sha256-jE0nxIM0K6rQDlYGDFyqcQrqRVh+wqoXQE+SHZMwe+A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mirror installed software on multiple machines";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "unstable-2024-02-03";
|
||||
version = "unstable-2024-02-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "1ca210648a6ca9b957efde5da957f3de6b1f0c45";
|
||||
hash = "sha256-ptshv4qXiC6V0GCfpABz88UGGPNwqs5tAxaRUKbk1Qo=";
|
||||
rev = "f99eace7c167b8a6a0871849493b1c613d0f1b80";
|
||||
hash = "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3226,8 +3226,6 @@ with pkgs;
|
|||
|
||||
apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { };
|
||||
|
||||
apfsprogs = callPackage ../tools/filesystems/apfsprogs { };
|
||||
|
||||
api-linter = callPackage ../development/tools/api-linter { };
|
||||
|
||||
apk-tools = callPackage ../tools/package-management/apk-tools {
|
||||
|
|
@ -10755,10 +10753,6 @@ with pkgs;
|
|||
inherit (python3Packages) mako;
|
||||
};
|
||||
|
||||
manix = callPackage ../tools/nix/manix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
marktext = callPackage ../applications/misc/marktext { };
|
||||
|
||||
mars-mips = callPackage ../development/tools/mars-mips { };
|
||||
|
|
@ -34608,8 +34602,6 @@ with pkgs;
|
|||
|
||||
potrace = callPackage ../applications/graphics/potrace { };
|
||||
|
||||
posterazor = callPackage ../applications/misc/posterazor { };
|
||||
|
||||
pqiv = callPackage ../applications/graphics/pqiv { };
|
||||
|
||||
qiv = callPackage ../applications/graphics/qiv {
|
||||
|
|
|
|||
Loading…
Reference in a new issue