gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-12-07 00:15:17 +00:00
committed by GitHub
parent 70c02e58ef c90e086ba3
commit 171c0c7ed6
91 changed files with 1354 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/release-notes/rl-2505.section.md
+2
View File
@@ -33,6 +33,8 @@
- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).
- [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
nixos/modules/misc/locate.nix
+15 -1
View File
@@ -278,11 +278,23 @@ in
PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no";
};
serviceConfig = {
CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN";
Nice = 19;
IOSchedulingClass = "idle";
IPAddressDeny = "any";
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateTmp = "yes";
PrivateDevices = true;
PrivateNetwork = "yes";
NoNewPrivileges = "yes";
ProtectClock = true;
ProtectControlGroups = true;
ProtectHostname = true;
RestrictAddressFamilies = "AF_UNIX";
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
ReadOnlyPaths = "/";
# Use dirOf cfg.output because mlocate creates temporary files next to
# the actual database. We could specify and create them as well,
@@ -290,6 +302,8 @@ in
# NOTE: If /var/cache does not exist, this leads to the misleading error message:
# update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
ReadWritePaths = dirOf cfg.output;
SystemCallArchitectures = "native";
SystemCallFilter = "@system-service @chown";
};
};
nixos/modules/services/desktop-managers/lomiri.nix
+1
View File
@@ -90,6 +90,7 @@ in
lomiri-filemanager-app
lomiri-gallery-app
lomiri-history-service
lomiri-mediaplayer-app
lomiri-polkit-agent
lomiri-schemas # exposes some required dbus interfaces
lomiri-session # wrappers to properly launch the session
nixos/modules/services/monitoring/prometheus/exporters.nix
+1
View File
@@ -58,6 +58,7 @@ let
"mikrotik"
"modemmanager"
"mongodb"
"mqtt"
"mysqld"
"nats"
"nextcloud"
nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix
+140
View File
@@ -0,0 +1,140 @@
{
config,
lib,
pkgs,
options,
utils,
}:
let
inherit (lib)
mkIf
mkEnableOption
mkOption
types
;
cfg = config.services.prometheus.exporters.mqtt;
toConfigBoolean = x: if x then "True" else "False";
toConfigList = builtins.concatStringsSep ",";
in
{
# https://github.com/kpetremann/mqtt-exporter/tree/master?tab=readme-ov-file#configuration
port = 9000;
extraOpts = {
keepFullTopic = mkEnableOption "Keep entire topic instead of the first two elements only. Usecase: Shelly 3EM";
logLevel = mkOption {
type = types.enum [
"CRITICAL"
"ERROR"
"WARNING"
"INFO"
"DEBUG"
];
default = "INFO";
example = "DEBUG";
description = "Logging level";
};
logMqttMessage = mkEnableOption "Log MQTT original message, only if `LOG_LEVEL` is set to DEBUG.";
mqttIgnoredTopics = mkOption {
type = types.listOf types.str;
default = [ ];
description = "Lists of topics to ignore. Accepts wildcards.";
};
mqttAddress = mkOption {
type = types.str;
default = "127.0.0.1";
description = "IP or hostname of MQTT broker.";
};
mqttPort = mkOption {
type = types.port;
default = 1883;
description = "TCP port of MQTT broker.";
};
mqttTopic = mkOption {
type = types.str;
default = "#";
description = "Topic path to subscribe to.";
};
mqttKeepAlive = mkOption {
type = types.int;
default = 60;
example = 30;
description = "Keep alive interval to maintain connection with MQTT broker.";
};
mqttUsername = mkOption {
type = types.nullOr types.str;
default = null;
example = "mqttexporter";
description = "Username which should be used to authenticate against the MQTT broker.";
};
mqttV5Protocol = mkEnableOption "Force to use MQTT protocol v5 instead of 3.1.1.";
mqttClientId = mkOption {
type = types.nullOr types.str;
default = null;
description = "Set client ID manually for MQTT connection";
};
mqttExposeClientId = mkEnableOption "Expose the client ID as a label in Prometheus metrics.";
prometheusPrefix = mkOption {
type = types.str;
default = "mqtt_";
description = "Prefix added to the metric name.";
};
topicLabel = mkOption {
type = types.str;
default = "topic";
description = "Define the Prometheus label for the topic.";
};
zigbee2MqttAvailability = mkEnableOption "Normalize sensor name for device availability metric added by Zigbee2MQTT.";
zwaveTopicPrefix = mkOption {
type = types.str;
default = "zwave/";
description = "MQTT topic used for Zwavejs2Mqtt messages.";
};
esphomeTopicPrefixes = mkOption {
type = types.listOf types.str;
default = [ ];
description = "MQTT topic used for ESPHome messages.";
};
hubitatTopicPrefixes = mkOption {
type = types.listOf types.str;
default = [ "hubitat/" ];
description = "MQTT topic used for Hubitat messages.";
};
environmentFile = mkOption {
type = types.nullOr types.path;
default = null;
example = [ "/run/secrets/mqtt-exporter" ];
description = ''
File to load as environment file. Useful for e.g. setting `MQTT_PASSWORD`
without putting any secrets into the Nix store.
'';
};
};
serviceOpts = {
environment = {
KEEP_FULL_TOPIC = toConfigBoolean cfg.keepFullTopic;
LOG_LEVEL = cfg.logLevel;
LOG_MQTT_MESSAGE = toConfigBoolean cfg.logMqttMessage;
MQTT_IGNORED_TOPIC = toConfigList cfg.mqttIgnoredTopics;
MQTT_ADDRESS = cfg.mqttAddress;
MQTT_PORT = toString cfg.mqttPort;
MQTT_TOPIC = cfg.mqttTopic;
MQTT_KEEPALIVE = toString cfg.mqttKeepAlive;
MQTT_USERNAME = cfg.mqttUsername;
MQTT_V5_PROTOCOL = toConfigBoolean cfg.mqttV5Protocol;
MQTT_CLIENT_ID = mkIf (cfg.mqttClientId != null) cfg.mqttClientId;
PROMETHEUS_ADDRESS = cfg.listenAddress;
PROMETHEUS_PORT = toString cfg.port;
PROMETHEUS_PREFIX = cfg.prometheusPrefix;
TOPIC_LABEL = cfg.topicLabel;
ZIGBEE2MQTT_AVAILABILITY = toConfigBoolean cfg.zigbee2MqttAvailability;
ZWAVE_TOPIC_PREFIX = cfg.zwaveTopicPrefix;
ESPHOME_TOPIC_PREFIXES = toConfigList cfg.esphomeTopicPrefixes;
HUBITAT_TOPIC_PREFIXES = toConfigList cfg.hubitatTopicPrefixes;
};
serviceConfig = {
EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
ExecStart = lib.getExe pkgs.mqtt-exporter;
};
};
}
nixos/tests/all-tests.nix
+1
View File
@@ -563,6 +563,7 @@ in {
lomiri-clock-app = runTest ./lomiri-clock-app.nix;
lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix;
lomiri-gallery-app = runTest ./lomiri-gallery-app.nix;
lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};
lorri = handleTest ./lorri/default.nix {};
nixos/tests/lomiri-mediaplayer-app.nix
+77
View File
@@ -0,0 +1,77 @@
{ lib, ... }:
let
ocrContent = "Video Test";
videoFile = "test.webm";
in
{
name = "lomiri-mediaplayer-app-standalone";
meta.maintainers = lib.teams.lomiri.members;
nodes.machine =
{ config, pkgs, ... }:
{
imports = [ ./common/x11.nix ];
services.xserver.enable = true;
environment = {
# Setup video
etc."${videoFile}".source =
pkgs.runCommand videoFile
{
nativeBuildInputs = with pkgs; [
ffmpeg # produce video for OCR
(imagemagick.override { ghostscriptSupport = true; }) # produce OCR-able image
];
}
''
magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png
ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 100K -t 120 $out -loglevel fatal
'';
systemPackages = with pkgs.lomiri; [
suru-icon-theme
lomiri-mediaplayer-app
];
variables = {
UITK_ICON_THEME = "suru";
};
};
i18n.supportedLocales = [ "all" ];
fonts = {
packages = with pkgs; [
# Intended font & helps with OCR
ubuntu-classic
];
};
};
enableOCR = true;
testScript = ''
machine.wait_for_x()
with subtest("lomiri mediaplayer launches"):
machine.succeed("lomiri-mediaplayer-app >&2 &")
machine.wait_for_text("Choose from")
machine.screenshot("lomiri-mediaplayer_open")
machine.succeed("pkill -f lomiri-mediaplayer-app")
with subtest("lomiri mediaplayer plays video"):
machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &")
machine.wait_for_text("${ocrContent}")
machine.screenshot("lomiri-mediaplayer_playback")
machine.succeed("pkill -f lomiri-mediaplayer-app")
with subtest("lomiri mediaplayer localisation works"):
# OCR struggles with finding identifying the translated window title, and lomiri-content-hub QML isn't translated
# Cause an error, and look for the error popup
machine.succeed("touch invalid.mp4")
machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &")
machine.wait_for_text("Fehler")
machine.screenshot("lomiri-mediaplayer_localised")
'';
}
nixos/tests/prometheus-exporters.nix
+32
View File
@@ -804,6 +804,38 @@ let
'';
};
mqtt = {
exporterConfig = {
enable = true;
environmentFile = pkgs.writeText "mqtt-exporter-envfile" ''
MQTT_PASSWORD=testpassword
'';
};
metricProvider = {
services.mosquitto = {
enable = true;
listeners = [{
users.exporter = {
acl = [ "read #" ];
passwordFile = pkgs.writeText "mosquitto-password" "testpassword";
};
}];
};
systemd.services.prometheus-mqtt-exporter ={
wants = [ "mosquitto.service" ];
after = [ "mosquitto.service" ];
};
};
exporterTest = ''
wait_for_unit("mosquitto.service")
wait_for_unit("prometheus-mqtt-exporter.service")
wait_for_open_port(9000)
succeed(
"curl -sSf http://localhost:9000/metrics | grep '^python_info'"
)
'';
};
mysqld = {
exporterConfig = {
enable = true;
pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
nix-update-script,
}:
let
version = "0.7.1";
version = "0.7.3";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
rev = "refs/tags/v${version}";
hash = "sha256-IHl+XIldo2kculpbiOuLIJ6RJbFODiRlQU4x8hvE7pI=";
hash = "sha256-nxiODLKgGeXzN5sqkLWU0PcsuSSB1scSzTC5qyCxLCI=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
blink-fuzzy-lib = rustPlatform.buildRustPackage {
pkgs/applications/graphics/xournalpp/default.nix
+2 -2
View File
@@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
version = "1.2.4";
version = "1.2.5";
src = fetchFromGitHub {
owner = "xournalpp";
repo = "xournalpp";
rev = "v${version}";
hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk=";
hash = "sha256-Hm3NDVELOnwjg6NiV5VBbt/15slHAgOVZLTV3zBMkLI=";
};
postPatch = ''
pkgs/applications/networking/browsers/palemoon/bin.nix
+3 -3
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.4.1";
version = "33.5.0";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
in {
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-pjOzU8atFNzYujxxoVihn0Cvq4Xvh7U2auSznE29Wpc=";
hash = "sha256-TlmDsZKHolTS+y+1BymyY49+AvqUv8zmUXCGNHCRPL0=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-ikgO0vVTySw3I6gdSu5k2e35xZ95bJY4f18Fjh+c0rA=";
hash = "sha256-f6vLHbpmvVfkjZr7x0DiCFoGGvfxHfFZ3KTagq2Mwp4=";
};
};
pkgs/applications/networking/cluster/terraform-providers/providers.json
+9 -9
View File
@@ -552,13 +552,13 @@
"vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI="
},
"hcloud": {
"hash": "sha256-td1R2Xeo1QfsNJOwE7cCuzF5OjW4XUQJOVd0LPAXfuE=",
"hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.48.1",
"rev": "v1.49.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w="
"vendorHash": "sha256-TFH5tHOTRNPUMGYeYQ1ZbM6FjcojYnkB2NwnQOacTvg="
},
"helm": {
"hash": "sha256-8cYhbxbjTfloDd3cLYNPv98TzeC0XVrb4DQ2ScZDYvI=",
@@ -651,13 +651,13 @@
"vendorHash": null
},
"incus": {
"hash": "sha256-VHoEUcFwsERC3EKfobTEoWOxuiOEBzEaWXL+mzlTe44=",
"hash": "sha256-Dva5bFyJpxifsQl62xnjvqEQ5SknUmCLfGX4fFx5FAE=",
"homepage": "https://registry.terraform.io/providers/lxc/incus",
"owner": "lxc",
"repo": "terraform-provider-incus",
"rev": "v0.1.4",
"rev": "v0.2.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-7MQi9gJU0RAm9jTiY/YjkEU5QsxSX2lbUC7qvT20mes="
"vendorHash": "sha256-xr54yCVGOJbj0612wiljUkx1wEOSuXB1qrGbF/vCwN8="
},
"infoblox": {
"hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=",
@@ -1174,13 +1174,13 @@
"vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo="
},
"spacelift": {
"hash": "sha256-HJ+QlbmMvn45l9KjmVzoK/jETIosOSlcLtw4B1kdEIo=",
"hash": "sha256-RWrhVeXPEgFYFGh34vFargTrZH+3CxY36+i0lmFSjXg=",
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
"owner": "spacelift-io",
"repo": "terraform-provider-spacelift",
"rev": "v1.16.1",
"rev": "v1.19.0",
"spdx": "MIT",
"vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U="
"vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs="
},
"spotinst": {
"hash": "sha256-Yq52eCxT+XWoTONcLTDlIpy/jnU76JajsoqKYXFK8AM=",
pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix
+1 -2
View File
@@ -52,8 +52,7 @@
{
name = "dotnet-fixup-hook";
substitutions = {
# this is used for DOTNET_ROOT, so we need unwrapped
dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime.unwrapped else null;
dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null;
wrapperPath = lib.makeBinPath [ which coreutils ];
};
}
pkgs/by-name/am/amdvlk/package.nix
+3 -5
View File
@@ -23,19 +23,17 @@
let
suffix = if stdenv.system == "x86_64-linux" then "64" else "32";
# Fix https://github.com/NixOS/nixpkgs/issues/348903 until the glslang update to 15.0.0 is merged into master
glslang_fixed = glslang.overrideAttrs (finalAttrs: oldAttrs: { cmakeFlags = [ ]; });
in
stdenv.mkDerivation (finalAttrs: {
pname = "amdvlk";
version = "2024.Q3.3";
version = "2024.Q4.2";
src = fetchRepoProject {
name = "amdvlk-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${finalAttrs.version}";
hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0=";
hash = "sha256-16eHtdxoSCVEPQNvi7Kuo7CP4yddMsZqpuRsWobEOnw=";
};
buildInputs =
@@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
[
cmake
directx-shader-compiler
glslang_fixed
glslang
ninja
patchelf
perl
pkgs/by-name/ch/chocolate-doom/package.nix
+39 -25
View File
@@ -1,31 +1,29 @@
{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net
, fetchFromGitHub, fetchpatch, python3 }:
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
libpng,
libsamplerate,
pkg-config,
python3,
SDL2,
SDL2_mixer,
SDL2_net,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "chocolate-doom";
version = "3.0.1";
version = "3.1.0";
src = fetchFromGitHub {
owner = "chocolate-doom";
repo = pname;
rev = "${pname}-${version}";
sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp";
repo = "chocolate-doom";
rev = "refs/tags/chocolate-doom-${finalAttrs.version}";
hash = "sha256-yDPfqCuzRbDhOQisIDAGo2bmmMjT+0lds5xc9C2pqoU=";
};
patches = [
# Pull upstream patch to fix builx against gcc-10:
# https://github.com/chocolate-doom/chocolate-doom/pull/1257
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch";
sha256 = "1dmbygn952sy5n8qqp0asg11pmygwgygl17lrj7i0fxa0nrhixhj";
})
];
outputs = [ "out" "man" ];
postPatch = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
patchShebangs --build man/{simplecpp,docgen}
'';
@@ -35,15 +33,31 @@ stdenv.mkDerivation rec {
# for documentation
python3
];
buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
buildInputs = [
libpng
libsamplerate
SDL2
SDL2_mixer
SDL2_net
];
outputs = [
"out"
"man"
];
enableParallelBuilding = true;
strictDeps = true;
meta = {
homepage = "http://chocolate-doom.org/";
homepage = "https://www.chocolate-doom.org";
changelog = "https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-${finalAttrs.version}";
description = "Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s";
mainProgram = "chocolate-doom";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
hydraPlatforms = lib.platforms.linux; # darwin times out
maintainers = [ ];
maintainers = with lib.maintainers; [ Gliczy ];
};
}
})
pkgs/by-name/co/containerlab/package.nix
+3 -3
View File
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "containerlab";
version = "0.59.0";
version = "0.60.0";
src = fetchFromGitHub {
owner = "srl-labs";
repo = "containerlab";
rev = "v${version}";
hash = "sha256-4YSnAoQkjDpSRBMqYW8D3TzipE5Co892y5PXkcz+8xA=";
hash = "sha256-+Xq4/cRtTYqbexajHtILAZvy0NWLn9UMxR1ksg0/JuY=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-PJQrQn7QPtUSzdlf2BYY8ARcmH6pzZgpl1oQbc98M4Y=";
vendorHash = "sha256-YX2JDDZ1jx32zfFj/2fY61zqxPIzmwntN+7kiGDxxV4=";
ldflags = [
"-s"
pkgs/by-name/da/dafny/package.nix
+1 -1
View File
@@ -42,7 +42,7 @@ buildDotnetModule rec {
'';
dotnet-sdk = dotnetCorePackages.sdk_6_0;
buildInputs = [ jdk11 ];
nativeBuildInputs = [ jdk11 ];
nugetDeps = ./deps.nix;
# Build just these projects. Building Source/Dafny.sln includes a bunch of
pkgs/by-name/do/docker-init/package.nix
+2 -3
View File
@@ -6,8 +6,8 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "docker-init";
version = "v1.3.0";
tag = "157355";
version = "v1.4.0";
tag = "175267";
src = fetchurl {
url = "https://desktop.docker.com/linux/main/amd64/${finalAttrs.tag}/docker-desktop-x86_64.pkg.tar.zst";
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "docker-init";
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
badPlatforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ BastianAsmussen ];
};
pkgs/by-name/dy/dyalog/package.nix
+1 -1
View File
@@ -32,7 +32,7 @@
let
dyalogHome = "$out/lib/dyalog";
makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8.unwrapped}/share/dotnet";
makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet";
licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf";
pkgs/by-name/gi/github-runner/package.nix
+8 -1
View File
@@ -1,5 +1,7 @@
{
bash,
buildDotnetModule,
coreutils,
darwin,
dotnetCorePackages,
fetchFromGitHub,
@@ -111,12 +113,17 @@ buildDotnetModule rec {
[
which
git
# needed for `uname`
coreutils
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
darwin.autoSignDarwinBinariesHook
];
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
buildInputs = [
(lib.getLib stdenv.cc.cc)
bash
];
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
pkgs/by-name/gi/gitu/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitu";
version = "0.26.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "altsem";
repo = "gitu";
rev = "v${version}";
hash = "sha256-rHlehYdyBYyhP/kFciFW0vmaewtXYuypaHMzqyMDXYA=";
hash = "sha256-/g+hjQQhu771yqLhx4THaNCJKShXB7RoxiS9bQDUijU=";
};
cargoHash = "sha256-b0Z1SOprsVe8Sg4X0ooOahE9yrP65CV1otZ3nXFvPHo=";
cargoHash = "sha256-cK7TjrP2KW3w7UFr+6pUIjeesPaJKs4lXorw98zwuD4=";
nativeBuildInputs = [
pkg-config
pkgs/applications/misc/gpxlab/default.nix → pkgs/by-name/gp/gpxlab/package.nix
+14 -4
View File
@@ -1,8 +1,11 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub
, qmake, qttools
{
stdenv,
lib,
fetchFromGitHub,
qt5,
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "gpxlab";
version = "0.7.0";
@@ -13,7 +16,11 @@ mkDerivation rec {
sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84";
};
nativeBuildInputs = [ qmake qttools ];
nativeBuildInputs = [
qt5.qmake
qt5.qttools
qt5.wrapQtAppsHook
];
preConfigure = ''
lrelease GPXLab/locale/*.ts
@@ -22,6 +29,9 @@ mkDerivation rec {
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
mv GPXLab/GPXLab.app $out/Applications
mkdir -p $out/bin
ln -s $out/Applications/GPXLab.app/Contents/MacOS/GPXLab $out/bin/gpxlab
'';
meta = with lib; {
pkgs/by-name/ko/komikku/package.nix
+3 -3
View File
@@ -23,7 +23,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.64.0";
version = "1.65.0";
format = "other";
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
rev = "v${version}";
hash = "sha256-EpKLez5gTHCSJYGvDqmzj6YO1dIugZKrEP4zE2G5TxA=";
hash = "sha256-U+ekx6ON3mLaTqaQ6PYe9bGVWMyq9PXZyv+rQ1cd1n0=";
};
nativeBuildInputs = [
@@ -112,7 +112,7 @@ python3.pkgs.buildPythonApplication rec {
changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}";
maintainers = with lib.maintainers; [
chuangzhu
infinitivewitch
Gliczy
];
};
}
pkgs/by-name/li/libratbag/package.nix
+52 -16
View File
@@ -1,36 +1,72 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsNoGuiHook, gobject-introspection
, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3
, json-glib, libunistring }:
{
lib,
stdenv,
fetchFromGitHub,
meson,
ninja,
pkg-config,
wrapGAppsNoGuiHook,
gobject-introspection,
glib,
systemd,
udev,
libevdev,
gitMinimal,
check,
valgrind,
swig,
python3,
json-glib,
libunistring,
}:
stdenv.mkDerivation rec {
pname = "libratbag";
version = "0.17";
version = "0.18";
src = fetchFromGitHub {
owner = "libratbag";
repo = "libratbag";
rev = "v${version}";
sha256 = "sha256-TQ8DVj4yqq3IA0oGnLDz+QNTyNRmGqspEjkPeBmXNew=";
owner = "libratbag";
repo = "libratbag";
rev = "v${version}";
hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc=";
};
nativeBuildInputs = [
meson ninja pkg-config gitMinimal swig check valgrind wrapGAppsNoGuiHook gobject-introspection
meson
ninja
pkg-config
gitMinimal
swig
check
valgrind
wrapGAppsNoGuiHook
gobject-introspection
];
buildInputs = [
glib systemd udev libevdev json-glib libunistring
(python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
glib
systemd
udev
libevdev
json-glib
libunistring
(python3.withPackages (
ps: with ps; [
evdev
pygobject3
]
))
];
mesonFlags = [
"-Dsystemd-unit-dir=./lib/systemd/system/"
];
meta = with lib; {
meta = {
description = "Configuration library for gaming mice";
homepage = "https://github.com/libratbag/libratbag";
license = licenses.mit;
maintainers = with maintainers; [ mvnetbiz ];
platforms = platforms.linux;
homepage = "https://github.com/libratbag/libratbag";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mvnetbiz ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ne/netcoredbg/package.nix
+1 -1
View File
@@ -36,7 +36,7 @@ let
cmakeFlags = [
"-DCORECLR_DIR=${coreclr-src}/src/coreclr"
"-DDOTNET_DIR=${dotnet-sdk.unwrapped}/share/dotnet"
"-DDOTNET_DIR=${dotnet-sdk}/share/dotnet"
"-DBUILD_MANAGED=0"
];
};
pkgs/by-name/or/orbiton/package.nix
+2 -2
View File
@@ -4,13 +4,13 @@
buildGoModule rec {
pname = "orbiton";
version = "2.68.2";
version = "2.68.4";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
hash = "sha256-aCGdBG3AqD8PJHIHhie0KELQNRcD8JQfmjM2bDEjFbo=";
hash = "sha256-VEYeC3gtjBxkDYH/fEsdKtIInB8E2pcHokinspdj10Q=";
};
vendorHash = null;
pkgs/by-name/pi/piper/package.nix
+47 -17
View File
@@ -1,29 +1,59 @@
{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3
, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, adwaita-icon-theme
, gobject-introspection, librsvg }:
{
lib,
meson,
ninja,
pkg-config,
gettext,
fetchFromGitHub,
python3,
wrapGAppsHook3,
gtk3,
glib,
desktop-file-utils,
appstream-glib,
adwaita-icon-theme,
gobject-introspection,
librsvg,
}:
python3.pkgs.buildPythonApplication rec {
pname = "piper";
version = "0.7";
version = "0.8";
format = "other";
src = fetchFromGitHub {
owner = "libratbag";
repo = "piper";
rev = version;
sha256 = "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf";
owner = "libratbag";
repo = "piper";
rev = version;
hash = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4=";
};
nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ];
nativeBuildInputs = [
meson
ninja
gettext
pkg-config
wrapGAppsHook3
desktop-file-utils
appstream-glib
gobject-introspection
];
buildInputs = [
gtk3 glib adwaita-icon-theme python3 librsvg
gtk3
glib
adwaita-icon-theme
python3
librsvg
];
propagatedBuildInputs = with python3.pkgs; [
lxml
evdev
pygobject3
];
propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
mesonFlags = [
"-Druntime-dependency-checks=false"
"-Dtests=false"
];
postPatch = ''
@@ -31,12 +61,12 @@ python3.pkgs.buildPythonApplication rec {
patchShebangs meson_install.sh data/generate-piper-gresource.xml.py
'';
meta = with lib; {
meta = {
description = "GTK frontend for ratbagd mouse config daemon";
mainProgram = "piper";
homepage = "https://github.com/libratbag/piper";
license = licenses.gpl2Only;
maintainers = with maintainers; [ mvnetbiz ];
platforms = platforms.linux;
homepage = "https://github.com/libratbag/piper";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ mvnetbiz ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/pm/pmtiles/package.nix
+3 -3
View File
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "pmtiles";
version = "1.22.1";
version = "1.22.2";
src = fetchFromGitHub {
owner = "protomaps";
repo = "go-pmtiles";
rev = "v${version}";
hash = "sha256-b473V082jM8d0XRn4tPzVGLryFNHn5Cab3IkNWve49s=";
hash = "sha256-TEQDjtSMJFZAYCoYXHmJxpxadYyd5DTo7HUhjglLRG8=";
};
vendorHash = "sha256-QDGs0L29W4QQBeIH1Z23nI/FYdu95kLnOAIZEWPOMWw=";
vendorHash = "sha256-KRjMEH17cvSjtRP/qYeWRFUo6f6v1ZxEd+H3xvZ1udQ=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
pkgs/by-name/pr/pre-commit/package.nix
+1 -1
View File
@@ -93,7 +93,7 @@ buildPythonApplication rec {
VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8
# Resolve `.NET location: Not found` errors for dotnet tests
export DOTNET_ROOT="${dotnet-sdk.unwrapped}/share/dotnet"
export DOTNET_ROOT="${dotnet-sdk}/share/dotnet"
export HOME=$(mktemp -d)
pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock
Generated
+519 -343
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
+17 -5
View File
@@ -3,17 +3,19 @@
fetchgit,
rustPlatform,
testers,
proxmox-auto-install-assistant,
pkg-config,
openssl,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "proxmox-auto-install-assistant";
version = "8.2.6";
version = "8.3.3";
src = fetchgit {
url = "git://git.proxmox.com/git/pve-installer.git";
rev = "c339618cbdcbce378bf192e01393a60903fe2b04";
hash = "sha256-nF2FpzXeoPIB+dW92HAI+EJZuMJxlnD012Yu3hL9OvU=";
rev = "cf6df4a23491071d207dcc8b00af8ddf310ae0b0";
hash = "sha256-n4mn8VF84QyJiUNubgoxkbMEbuyj8n5KeIdVB3Xz5iY=";
};
postPatch = ''
@@ -28,7 +30,17 @@ rustPlatform.buildRustPackage rec {
cargoLock.lockFile = ./Cargo.lock;
passthru.tests.version = testers.testVersion { package = proxmox-auto-install-assistant; };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl.dev ];
postFixup = ''
# openssl is not actually necessary, only pulled in through a feature (unfortunately)
patchelf --remove-needed libssl.so.3 $out/bin/proxmox-auto-install-assistant
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
meta = {
description = "Tool to prepare a Proxmox installation ISO for automated installations";
pkgs/by-name/ra/raycast/package.nix
+2 -2
View File
@@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.87.2";
version = "1.87.4";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-w4jrtrKCATUsFkMVsGee88pYiL1bahHaSy9emCh2GJE=";
hash = "sha256-tM8j9oFIn5gAskM7Fxu4xMRh3pRsmroDDLkGyaie9I0=";
};
dontPatch = true;
pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "signal-desktop";
version = "7.34.0";
version = "7.35.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
hash = "sha256-UfyD2R78SkvAn7PppOfAK/zzPPpRVdI3y2T/F07ad1E=";
hash = "sha256-+ZzZp3/koitwtHyUmcgltcYo91KfDfQzOjnOzTJJu6c=";
};
sourceRoot = ".";
pkgs/by-name/si/signal-desktop/signal-desktop.nix
+2 -2
View File
@@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.34.0";
version = "7.35.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-q0vv96esQ6LRVVwxSQDh4BdbOZrc+caB+TRDWKfDlZ8=";
hash = "sha256-cQ7bwgRjlI2idnHtl7EZyBfjcPz52s8+E7UpLxn4FEg=";
}
pkgs/by-name/ta/tagger/package.nix
+1 -1
View File
@@ -31,11 +31,11 @@ buildDotnetModule rec {
nativeBuildInputs = [
blueprint-compiler
libadwaita
];
buildInputs = [
chromaprint
libadwaita
];
runtimeDeps = [
pkgs/by-name/un/unrar/package.nix
+2 -2
View File
@@ -6,12 +6,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "unrar";
version = "7.1.1";
version = "7.1.2";
src = fetchzip {
url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
stripRoot = false;
hash = "sha256-dGF5xCZRHnaMVj/OGIIFbytN7Jnj39gq7ym6hq/EZsk=";
hash = "sha256-6xqAik10YSXh2pm/j0dSeQXDWAGVnOf6eOD7Od9+LZA=";
};
sourceRoot = finalAttrs.src.name;
pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
+166
View File
@@ -0,0 +1,166 @@
{
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
nixosTests,
cmake,
gettext,
gst_all_1,
lomiri-action-api,
lomiri-content-hub,
lomiri-ui-toolkit,
pkg-config,
qtbase,
qtdeclarative,
qtmultimedia,
qtxmlpatterns,
wrapGAppsHook3,
wrapQtAppsHook,
xvfb-run,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-mediaplayer-app";
version = "1.1.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-mediaplayer-app";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-Pq1TA7eoHDRRzr6zT2cmIye91uz/0YsmQ8Qp79244wg=";
};
patches = [
# Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/35 merged & in release
(fetchpatch {
name = "0001-lomiri-mediaplayer-app-Fix-GNUInstallDirs-usage.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/baaa0ea7cba2a9f8bc7f223246857eba1cd5d8e4.patch";
hash = "sha256-RChPRi4zrAWJEl4Urznh5FRYuTnxCFzG+gZurrF7Ym0=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/36 merged & in release
(fetchpatch {
name = "0002-lomiri-mediaplayer-app-Drop-NO_DEFAULT_PATH-for-qmltestrunner.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/3bf4ebae7eb59176af984d07ad72b67ee0bd1b8f.patch";
hash = "sha256-dJCW0dKe7Tq1Mg9CSdVQHamObVrPS7COXsdv41SWnHg=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/37 merged & in release
(fetchpatch {
name = "0003-lomiri-mediaplayer-app-BUILD_TESTING.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/df1aadb82d73177133bc096307ec1ef1e2b0c2ed.patch";
hash = "sha256-dvkGjG0ptCmLDIAWzDjOzu+Q/5bgVdb/+RmE6v8fV0Q=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/38 merged & in release
(fetchpatch {
name = "0004-lomiri-mediaplayer-app-bindtextdomain.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/bd927e823205214f9ea01dfb1f93171a8952ecf9.patch";
hash = "sha256-/lg0elv9weNnRGq1oD94/sE511EZ0TmXZsURcauQobI=";
})
(fetchpatch {
name = "0005-lomiri-mediaplayer-app-Fix-title-localisation.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/c4cba819dd55e7e85c4ea496626bed9aa78470a5.patch";
hash = "sha256-EiUxaCa5ANnRSciB8IodQOGnmG4rE/g/M+K4XcyqTI8=";
})
];
postPatch = ''
# We don't want absolute paths in desktop files
substituteInPlace data/lomiri-mediaplayer-app.desktop.in.in \
--replace-fail 'Icon=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_ICON@' 'Icon=lomiri-mediaplayer-app' \
--replace-fail 'X-Lomiri-SymbolicIcon=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_SYMBOLIC_ICON@' 'X-Lomiri-SymbolicIcon=lomiri-app-launch/symbolic/lomiri-mediaplayer-app.svg' \
--replace-fail 'X-Lomiri-Splash-Image=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_SPLASH@' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-mediaplayer-app.svg'
'';
strictDeps = true;
nativeBuildInputs = [
cmake
gettext
pkg-config
wrapGAppsHook3
wrapQtAppsHook
];
buildInputs =
[
qtbase
qtmultimedia
# QML
lomiri-action-api
lomiri-content-hub
lomiri-ui-toolkit
qtxmlpatterns
]
# QtMultimedia playback support
++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
]);
nativeCheckInputs = [
qtdeclarative # qmltestrunner
xvfb-run
];
checkInputs = [ lomiri-ui-toolkit ];
dontWrapGApps = true;
cmakeFlags = [ (lib.cmakeBool "ENABLE_AUTOPILOT" false) ];
# Only test segfaults in Nix sandbox, see LSS for details
doCheck = false;
preCheck =
let
listToQtVar =
list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list;
in
''
export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix}
export QML2_IMPORT_PATH=${
listToQtVar [
lomiri-ui-toolkit
qtmultimedia
qtxmlpatterns
] qtbase.qtQmlPrefix
}
'';
postInstall = ''
mkdir -p $out/share/{icons/hicolor/256x256/apps,lomiri-app-launch/{symbolic,splash}}
ln -s $out/share/{lomiri-mediaplayer-app,icons/hicolor/256x256/apps}/lomiri-mediaplayer-app.png
ln -s $out/share/{lomiri-mediaplayer-app/lomiri-mediaplayer-app-splash.svg,lomiri-app-launch/splash/lomiri-mediaplayer-app.svg}
ln -s $out/share/{lomiri-mediaplayer-app/lomiri-mediaplayer-app-symbolic.svg,lomiri-app-launch/symbolic/lomiri-mediaplayer-app.svg}
'';
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru = {
tests.vm = nixosTests.lomiri-mediaplayer-app;
updateScript = gitUpdater { };
};
meta = {
description = "Media Player application for Ubuntu Touch devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${finalAttrs.version}/ChangeLog";
license = with lib.licenses; [
gpl3Only
cc-by-sa-30
];
mainProgram = "lomiri-mediaplayer-app";
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;
};
})
pkgs/desktops/lomiri/default.nix
+1
View File
@@ -20,6 +20,7 @@ let
lomiri-docviewer-app = callPackage ./applications/lomiri-docviewer-app { };
lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { };
lomiri-gallery-app = callPackage ./applications/lomiri-gallery-app { };
lomiri-mediaplayer-app = callPackage ./applications/lomiri-mediaplayer-app { };
lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { };
lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { };
lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { };
pkgs/development/compilers/dotnet/combine-packages.nix
+9 -10
View File
@@ -4,6 +4,7 @@ dotnetPackages:
makeWrapper,
lib,
symlinkJoin,
callPackage,
}:
# TODO: Rethink how we determine and/or get the CLI.
# Possible options raised in #187118:
@@ -12,15 +13,16 @@ dotnetPackages:
# 3. Something else?
let
cli = builtins.head dotnetPackages;
mkWrapper = callPackage ./wrapper.nix { };
in
assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''
You must include at least one package, e.g
`with dotnetCorePackages; combinePackages [
sdk_6_0 aspnetcore_7_0
];`'';
(buildEnv {
name = "dotnet-core-combined";
paths = map (x: x.unwrapped) dotnetPackages;
mkWrapper "sdk" (buildEnv {
name = "dotnet-combined";
paths = dotnetPackages;
pathsToLink = map (x: "/share/dotnet/${x}") [
"host"
"packs"
@@ -34,7 +36,7 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''
postBuild =
''
mkdir -p "$out"/share/dotnet
cp "${cli.unwrapped}"/share/dotnet/dotnet $out/share/dotnet
cp "${cli}"/share/dotnet/dotnet $out/share/dotnet
cp -R "${cli}"/nix-support "$out"/
mkdir "$out"/bin
ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
@@ -43,6 +45,8 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''
ln -s ${cli.man} $man
'';
passthru = {
pname = "dotnet";
version = "combined";
inherit (cli) icu;
versions = lib.catAttrs "version" dotnetPackages;
@@ -53,9 +57,4 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''
};
inherit (cli) meta;
}).overrideAttrs
({
outputs = [
"out"
] ++ lib.optional (cli ? man) "man";
})
})
pkgs/development/compilers/dotnet/wrapper.nix
+3 -3
View File
@@ -46,8 +46,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
mkdir -p "$out"/bin "$out"/share/dotnet
mkdir -p "$out"/bin "$out"/share
ln -s "$src"/bin/* "$out"/bin
ln -s "$src"/share/dotnet "$out"/share
runHook postInstall
'';
@@ -125,8 +126,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
)
(
lib.optionalString (runtime != null) ''
# TODO: use runtime here
export DOTNET_ROOT=${runtime.unwrapped}/share/dotnet
export DOTNET_ROOT=${runtime}/share/dotnet
''
+ run
);
pkgs/development/python-modules/chromadb/default.nix
+3 -3
View File
@@ -52,7 +52,7 @@
buildPythonPackage rec {
pname = "chromadb";
version = "0.5.18";
version = "0.5.20";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -61,13 +61,13 @@ buildPythonPackage rec {
owner = "chroma-core";
repo = "chroma";
rev = "refs/tags/${version}";
hash = "sha256-kJzBwUaA46HenwTn24AMy0xfgVmBtubJUujDS5/kYXs=";
hash = "sha256-DQHkgCHtrn9xi7Kp7TZ5NP1EtFtTH5QOvne9PUvxsWc=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-iW68C3Vp9C1gR7hF2x4VhBIKWX9wlnT8jPj+zMRUC7w=";
hash = "sha256-vHH7Uq4Jf8/5Vc8oZ5nvAeq/dFVWywsQYbp7yJkfX7Q=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/django/4.nix
+4 -1
View File
@@ -125,7 +125,10 @@ buildPythonPackage rec {
tzdata
] ++ lib.flatten (lib.attrValues optional-dependencies);
doCheck = !stdenv.hostPlatform.isDarwin;
doCheck =
!stdenv.hostPlatform.isDarwin
# pywatchman depends on folly which does not support 32bits
&& !stdenv.hostPlatform.is32bit;
preCheck = ''
# make sure the installed library gets imported
pkgs/development/python-modules/django/5.nix
+4 -1
View File
@@ -114,7 +114,10 @@ buildPythonPackage rec {
tzdata
] ++ lib.flatten (lib.attrValues optional-dependencies);
doCheck = !stdenv.hostPlatform.isDarwin;
doCheck =
!stdenv.hostPlatform.isDarwin
# pywatchman depends on folly which does not support 32bits
&& !stdenv.hostPlatform.is32bit;
preCheck = ''
# make sure the installed library gets imported
pkgs/development/python-modules/hahomematic/default.nix
+3 -3
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2024.11.8";
version = "2024.12.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -25,14 +25,14 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = "hahomematic";
rev = "refs/tags/${version}";
hash = "sha256-fDHt9D2Lr3yVLhWYar4ANeq3W4A1lhAxSLTjWqJzJNE=";
hash = "sha256-RLgJiapsRM8dMA4+T2S6DkSFjo+YBmVVpo1mOVKJ7EI=";
};
__darwinAllowLocalNetworking = true;
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools==75.1.0" "setuptools" \
--replace-fail "setuptools==75.6.0" "setuptools" \
'';
build-system = [ setuptools ];
pkgs/development/python-modules/llama-cloud/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-cloud";
version = "0.1.4";
version = "0.1.6";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_cloud";
inherit version;
hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg=";
hash = "sha256-ISAPb91G4IRV00sTb2Rc5rjDgA4K4T2Ad5Excakh2lo=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-agent-openai/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-agent-openai";
version = "0.3.4";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_agent_openai";
inherit version;
hash = "sha256-gONAjZcSG+vKP6P/0UtRKFhwwcPHPU7gTT0Yz+YEBGY=";
hash = "sha256-MdJnXb2ESJdW3QYqf/7TMLKr3KO3cV1RFnT1tQdeTdY=";
};
pythonRelaxDeps = [ "llama-index-llms-openai" ];
pkgs/development/python-modules/llama-index-cli/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "llama-index-cli";
version = "0.3.1";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_cli";
inherit version;
hash = "sha256-GJDdaHz0QPNlE2WlSeMDNjFiwWe4772Ho6oQBY1tXHc=";
hash = "sha256-1qsgE1mWKoo0Norto6Sbu+Z+ngCcWb2SXE+yvkrOOQY=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-core/default.nix
+2 -2
View File
@@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "llama-index-core";
version = "0.11.23";
version = "0.12.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "run-llama";
repo = "llama_index";
rev = "refs/tags/v${version}";
hash = "sha256-DMdU8LT1IGTHM8EsCX44MvGv+luOsKnPSI7yRR5ULPo=";
hash = "sha256-Zt97JZHp0MsHFtdrx6Xjqhz/jREWwevGSz8u9l5t8oI=";
};
sourceRoot = "${src.name}/${pname}";
pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-embeddings-gemini";
version = "0.2.2";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_embeddings_gemini";
inherit version;
hash = "sha256-lVW12tWDqNQW+mijxcF98aOuNw006xTdv0Cm+yZ4H0o=";
hash = "sha256-vytKBvvNVbW1GpFS9+0ydkyUqih3UUGusRIp79hMjtI=";
};
pythonRelaxDeps = [ "google-generativeai" ];
pkgs/development/python-modules/llama-index-embeddings-google/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-embeddings-google";
version = "0.2.1";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_embeddings_google";
inherit version;
hash = "sha256-7L24jKB7uFs+4OIIsXdweJ3TRuP4SFjY/p97ocUfmL8=";
hash = "sha256-XS0ZYLxe7/ezeLEJE/lEUzcaIwN1TzS/bA5sCRyx/Lk=";
};
pythonRelaxDeps = [ "google-generativeai" ];
pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-embeddings-huggingface";
version = "0.3.1";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_embeddings_huggingface";
inherit version;
hash = "sha256-eu9jJKGVdua5W/6SfDvU/BxXJe3Onya05dLu+ifAL9s=";
hash = "sha256-zo+LMLKc/4VAGrohGChftj+4FHpWtlbuIPfoUQyghaI=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
+4 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-embeddings-ollama";
version = "0.3.1";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -18,9 +18,11 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_embeddings_ollama";
inherit version;
hash = "sha256-Wj51+hS+fisagpN0FsiAIE3JbhsdJibcW96T8CHntUA=";
hash = "sha256-6+czVEcPi2Bh1flhse5QcW1Uly7ylfslPj68OT1bNss=";
};
pythonRelaxDeps = [ "ollama" ];
build-system = [ poetry-core ];
dependencies = [
pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "llama-index-embeddings-openai";
version = "0.2.5";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_embeddings_openai";
inherit version;
hash = "sha256-AEfdcddHBoZF7XKMKTEqqRtlu+TGFCGAA0xk38XG9ug=";
hash = "sha256-o31bpcyUejajzqpB38ZdcmqHP/s6J7e0lZKE9blE9hc=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-graph-stores-nebula";
version = "0.3.0";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_graph_stores_nebula";
inherit version;
hash = "sha256-yT1jxJEnBKWcsHCgBPx8Ue+wkggdL9S2havmJtSYcD4=";
hash = "sha256-inkIF4LFaI8+zWa6jHK8TU+l19LiyUsbzzDTZTen0jY=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-graph-stores-neo4j";
version = "0.3.5";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_graph_stores_neo4j";
inherit version;
hash = "sha256-r3/bxG4EZmeJ5fa4mmE2OTlbvGN780rsze5HoKQssiY=";
hash = "sha256-XJQJaUCAvIAmLnyFuo81upmm9iMOD08iHm0/HZMHR1M=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-graph-stores-neptune";
version = "0.2.2";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_graph_stores_neptune";
inherit version;
hash = "sha256-0dT1T5DJEXBvCilwf4YZVZ2H43piI6xkpUGGpKu8GsY=";
hash = "sha256-RWrFrV35djxEF9Nfh5Fz5VxQA7Jon7cmxDJXigx2dmQ=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-indices-managed-llama-cloud";
version = "0.4.0";
version = "0.6.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_indices_managed_llama_cloud";
inherit version;
hash = "sha256-++v/eHaiGbarlokq58QyqSmRlfq49n1KSg6/baIQskI=";
hash = "sha256-8J5BgsvCor11roXOuxaBB1JH8NkbkxsJTKxDFThs6Ho=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-llms-ollama/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-ollama";
version = "0.3.6";
version = "0.4.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_ollama";
inherit version;
hash = "sha256-EoTvA98XH+/ulJ+NdenRzjo4Fy+ZAmmjjzkyj1qT6kc=";
hash = "sha256-MkLlJtsh3/TnuwQzAhN2BklrSQ8GOcJoDcwok9QWJw8=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-openai-like";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_openai_like";
inherit version;
hash = "sha256-0E7r8TZadpl557DevF3dXLHLx8oXXyeWABvUPLgx7Nw=";
hash = "sha256-Ah6D1kJAtGWH8i5XxgxTHe004Y12nIebTupIHIjJez0=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-llms-openai/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-openai";
version = "0.2.16";
version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_openai";
inherit version;
hash = "sha256-fGZt0nBWwnigef9F1T8fv8jtNjdkqnuu7i4D30f5Byo=";
hash = "sha256-ikQ6Vk59EneanwMMuC/jJDgD4hfXJBB2SsEW3UNVT+U=";
};
pythonRemoveDeps = [
pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-multi-modal-llms-openai";
version = "0.2.3";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_multi_modal_llms_openai";
inherit version;
hash = "sha256-jrm38f85Vu8JeeIbyD5qiF5AmHtxmfGV5GUl0G465AI=";
hash = "sha256-cemDx3ccOQiOQFjNeAKSGTFaD7YxueErkD5TJDuaP9Y=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-program-openai/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "llama-index-program-openai";
version = "0.2.0";
version = "0.3.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_program_openai";
inherit version;
hash = "sha256-QTmTVUHAESV/v+uWYrO/Eje3Ke9LHI9N31tnidI3SsQ=";
hash = "sha256-YDmmzb/2LGOIwH6CoVf+Lt07vvDFrfKSrYVGv07HW4I=";
};
pythonRelaxDeps = [ "llama-index-agent-openai" ];
pkgs/development/python-modules/llama-index-question-gen-openai/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "llama-index-question-gen-openai";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_question_gen_openai";
inherit version;
hash = "sha256-Pd4c7L1lEABjnCADHX6iMzQnaquxgcrED/Qk814QRl4=";
hash = "sha256-79O0aCMoCOnTR0ZwquqwDkG5D3X1LQyb+/ESB+CWPWI=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-readers-database/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-database";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_database";
inherit version;
hash = "sha256-/hI/3lCo0RpJ1yLJDFrnuQ565WoQQm9Sw7Sr4qp1fa0=";
hash = "sha256-AL5KoDBKKvN6rlXyvIEY1Dh0j6DyFLgSaWEk3nh6kRY=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-readers-file/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-file";
version = "0.3.0";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_file";
inherit version;
hash = "sha256-bGdfzS8FmaEx+J4cXtNSHd4xM4qbckp3IfXf1yQ+qNg=";
hash = "sha256-eCjewf63xT5tMUA4X4SZwOesdGJlKZOEcU3f0WP50Vo=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/llama-index-readers-json/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-json";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_json";
inherit version;
hash = "sha256-Sxya3Iw75sl6mGmKvRMe9Y8bIWh4cfXQPYbCyAvhnvU=";
hash = "sha256-mS8nEK8LV1wVh0wV7W8EujLH7QcPagHI4P5cT0bHAJ4=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-llama-parse";
version = "0.3.0";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_llama_parse";
inherit version;
hash = "sha256-pf6toIlXFNzEHWXdUSwcOM9w2K4ZlHz/grgNWOaqNn4=";
hash = "sha256-6Z7Fb0+FRtf9oafBriYWL7mst+vKw0O1q9tCNLRkTg8=";
};
pythonRelaxDeps = [ "llama-parse" ];
pkgs/development/python-modules/llama-index-readers-s3/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-s3";
version = "0.3.0";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_s3";
inherit version;
hash = "sha256-gTseRAdHZW2jzewN3rRC6B8yCgMu8H7Y3N6ZdH1D1nI=";
hash = "sha256-oCXpLZyIrZKNNDg8hkEh5xxXEqz7B1hLjE5OUwEIozg=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-readers-twitter/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-twitter";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_twitter";
inherit version;
hash = "sha256-1bxg/tbv5NrMezm9OQUojiQGutv+yhWY4gkeUXb4z2o=";
hash = "sha256-I7xZQj/Kpwl6D0ltNuKI7TYoQVD9lBiM6I63C23hCwY=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-readers-txtai/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-txtai";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_txtai";
inherit version;
hash = "sha256-jaCg3TeMkBKHtZRxpa5KrQb+uGP95qN1nWtrE08Oq98=";
hash = "sha256-N5FiwVZ+KWEQlcfVqHVcHJHzRb6Ct+iR2Dc+Wee7y+M=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-readers-weather/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "llama-index-readers-weather";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_readers_weather";
inherit version;
hash = "sha256-m4EaV14tcH2I5veHdgGjBloKKAShJqsJGS9Ci8xRnMg=";
hash = "sha256-oGk2M/YaVm8pY4JDFOWGkKbDhEfd/OYBgWLSzV3peAQ=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-vector-stores-chroma";
version = "0.3.0";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_vector_stores_chroma";
inherit version;
hash = "sha256-VAWSFqI71r0dw69MWYbbOLKTNYawQujuEmOF16XeziM=";
hash = "sha256-xel5WR0JrckfCbCPsfUj08/jDu488T5T2ihUDK6nNmo=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-vector-stores-google";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_vector_stores_google";
inherit version;
hash = "sha256-7BEgRLkhyCo0z3puoWcFRqa+xG6vQdkKFWvr9oz6xs4=";
hash = "sha256-6l4MFO7h5xJexN3Sf78F+OgzaKHNWxOffQvkqRhXEJw=";
};
pythonRelaxDeps = [ "google-generativeai" ];
pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "llama-index-vector-stores-postgres";
version = "0.2.6";
version = "0.3.2";
pyproject = true;
src = fetchPypi {
pname = "llama_index_vector_stores_postgres";
inherit version;
hash = "sha256-x6KOZMZ5W8F8FATH3ZAwAeyrZ/rvjzrEooaFgQsSATQ=";
hash = "sha256-Ny1hKQUwrzvb/GI2WRa80i0EsE92oqSEdj6hFBle6H8=";
};
pythonRemoveDeps = [ "psycopg2-binary" ];
pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "llama-index-vector-stores-qdrant";
version = "0.3.3";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_vector_stores_qdrant";
inherit version;
hash = "sha256-YpecQB3OHi7id/Mvu73dn+gcXjXzVZR5+Sr0KwkIbDs=";
hash = "sha256-hv6cxCSKNtjUfZYNk2oxrJi10wAL4kxZeTx3v1ejlKc=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/posthog/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "posthog";
version = "3.7.0";
version = "3.7.4";
pyproject = true;
src = fetchFromGitHub {
owner = "PostHog";
repo = "posthog-python";
rev = "refs/tags/v${version}";
hash = "sha256-1evqG/rdHBs0bAHM+bIHyT4tFE6tAE+aJyu5r0QqAMk=";
hash = "sha256-43ySHV2Idssd5YonzhyIpet98vinpQ4O2AKUiAlYahY=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/lmcloud/default.nix → pkgs/development/python-modules/pylamarzocco/default.nix
+4 -4
View File
@@ -14,8 +14,8 @@
}:
buildPythonPackage rec {
pname = "lmcloud";
version = "1.2.3";
pname = "pylamarzocco";
version = "1.2.11";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zweckj";
repo = "pylamarzocco";
rev = "refs/tags/v.${version}";
rev = "refs/tags/v${version}";
hash = "sha256-iRxn4xAP5b/2byeWbYm6mQwAu1TUmJgOVEqm/bZT9Xw=";
};
@@ -47,7 +47,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to interface with La Marzocco's cloud";
homepage = "https://github.com/zweckj/pylamarzocco";
changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v.${version}";
changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/tokenizers/default.nix
+14 -20
View File
@@ -1,6 +1,5 @@
{
lib,
stdenv,
linkFarm,
fetchurl,
buildPythonPackage,
@@ -8,23 +7,21 @@
python,
# nativeBuildInputs
pkg-config,
setuptools-rust,
rustPlatform,
cargo,
pkg-config,
rustPlatform,
rustc,
setuptools-rust,
# buildInputs
openssl,
libiconv,
Security,
# dependencies
huggingface-hub,
numpy,
# tests
datasets,
numpy,
pytestCheckHook,
requests,
tiktoken,
@@ -74,14 +71,14 @@ let
in
buildPythonPackage rec {
pname = "tokenizers";
version = "0.20.3";
version = "0.21.0";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "tokenizers";
rev = "refs/tags/v${version}";
hash = "sha256-NPH++kPPaSPR3jm6mfh+4aep6stj0I4bA24kFtaJSKU=";
tag = "v${version}";
hash = "sha256-G65XiVlvJXOC9zqcVr9vWamUnpC0aa4kyYkE2v1K2iY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
@@ -91,35 +88,32 @@ buildPythonPackage rec {
src
sourceRoot
;
hash = "sha256-S2AfsKBtitEfprp9vjTyCl772IBe/wqwqYVnnAEK3LE=";
hash = "sha256-5cw63ydyhpMup2tOe/hpG2W6YZ+cvT75MJBkE5Wap4s=";
};
sourceRoot = "${src.name}/bindings/python";
maturinBuildFlags = [ "--interpreter ${python.executable}" ];
nativeBuildInputs = [
cargo
pkg-config
setuptools-rust
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
cargo
rustc
setuptools-rust
];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
Security
];
buildInputs = [
openssl
];
dependencies = [
huggingface-hub
numpy
];
nativeCheckInputs = [
datasets
numpy
pytestCheckHook
requests
tiktoken
pkgs/development/python-modules/transformers/default.nix
+3 -3
View File
@@ -58,14 +58,14 @@
buildPythonPackage rec {
pname = "transformers";
version = "4.46.3";
version = "4.47.0";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "transformers";
rev = "refs/tags/v${version}";
hash = "sha256-unQ1BypPv3fcFLCq4yoyat4pNy4ub5kgKfQRnfhuaGI=";
tag = "v${version}";
hash = "sha256-TQQ+w+EH/KWLE7iaaAHGxfE74hCiLXcqlIr1TIBFGvo=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/velbus-aio/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2024.10.0";
version = "2024.11.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = "velbus-aio";
rev = "refs/tags/${version}";
hash = "sha256-4hMUh/0/srYIPed647Sh7H7DIp2oV7LN9srzLr0Qxps=";
hash = "sha256-hYtZgr5HJj1zjiCXBK63086ke/oWhO9CyIvnN/JUPm4=";
fetchSubmodules = true;
};
pkgs/development/tools/analysis/checkov/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.330";
version = "3.2.332";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-rMovncMrVpvj60WWdU5mBTpR2QVF2DLso1TUGjl3m38=";
hash = "sha256-O4stCuRm847mULyCSs+HXSBLsHIcXxtxXuUVysgd5/o=";
};
patches = [ ./flake8-compat-5.x.patch ];
pkgs/development/tools/pnpm/default.nix
+2 -2
View File
@@ -12,8 +12,8 @@ let
hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY=";
};
"9" = {
version = "9.14.4";
hash = "sha256-JqcmtjO2KaP6vaAG9pauQmCVSjYyyAVBEteuiXeeX5o=";
version = "9.15.0";
hash = "sha256-Caj+MaNP2nBjVGgGGfQAL0zO9trf+TJA0k72yDHw/Sg=";
};
};
pkgs/os-specific/linux/kernel/zen-kernels.nix
+5 -5
View File
@@ -5,16 +5,16 @@ let
variants = {
# ./update-zen.py zen
zen = {
version = "6.12.1"; #zen
version = "6.12.2"; #zen
suffix = "zen1"; #zen
sha256 = "18aws41zlayv4xd6489jzrhr8b3kwmrx2q1b50g67v4rsp02sb4p"; #zen
sha256 = "0a6anmfm6495j6lwlywr62ghpwdvbdn54bl5baya5jz7vfqc1ghj"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqx = {
version = "6.12.1"; #lqx
suffix = "lqx1"; #lqx
sha256 = "1q8rdghkgq0kn530pxncwsrfqlf3xfn4mdvxysdizyfn71vmrz8f"; #lqx
version = "6.12.2"; #lqx
suffix = "lqx3"; #lqx
sha256 = "18ibc0dz70vxb61mzdhbhbjg0kfxgcsrl3zdki0cqlhcvfxwk19h"; #lqx
isLqx = true;
};
};
pkgs/servers/home-assistant/component-packages.nix
+1 -3
View File
@@ -2299,14 +2299,13 @@
hassil
home-assistant-intents
ifaddr
lmcloud
mutagen
pymicro-vad
pyserial
pyspeex-noise
pyudev
zeroconf
];
]; # missing inputs: lmcloud
"lametric" = ps: with ps; [
demetriek
];
@@ -5458,7 +5457,6 @@
"kostal_plenticore"
"kraken"
"kulersky"
"lamarzocco"
"lametric"
"landisgyr_heat_meter"
"lastfm"
pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "danielperna84";
domain = "homematicip_local";
version = "1.72.0";
version = "1.73.0";
src = fetchFromGitHub {
owner = "danielperna84";
repo = "custom_homematic";
rev = "refs/tags/${version}";
hash = "sha256-K46rlurJCFliCphoIdE2z9Zhpo8sJ4Wq/+xSfHJoPRc=";
hash = "sha256-1ssmaX6G03i9KYgjCRMZqOG2apEZ0069fQnmVy2BVhA=";
};
dependencies = [
pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
+2
View File
@@ -39,6 +39,8 @@
universal-remote-card = callPackage ./universal-remote-card { };
vacuum-card = callPackage ./vacuum-card { };
valetudo-map-card = callPackage ./valetudo-map-card { };
weather-card = callPackage ./weather-card { };
pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix
Executable
+38
View File
@@ -0,0 +1,38 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
}:
buildNpmPackage rec {
pname = "vacuum-card";
version = "2.10.1";
src = fetchFromGitHub {
owner = "denysdovhan";
repo = "vacuum-card";
rev = "v${version}";
hash = "sha256-NJeD6YhXmNNBuhRWjK74sTrxzXyGSbehm5lz05sNA3Y=";
};
npmDepsHash = "sha256-x+pq58chBSgFVGr9Xtka5/MH/AHV0zMpyKfA/kEEXBM=";
installPhase = ''
runHook preInstall
mkdir $out
cp dist/vacuum-card.js $out
runHook postInstall
'';
passthru.entrypoint = "vacuum-card.js";
meta = with lib; {
description = "Vacuum cleaner card for Home Assistant Lovelace UI";
homepage = "https://github.com/denysdovhan/vacuum-card";
license = licenses.mit;
maintainers = with maintainers; [ baksa ];
platforms = platforms.all;
};
}
pkgs/test/dotnet/use-dotnet-from-env/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@ let
removeReferencesTo
];
postFixup = (oldAttrs.postFixup or "") + ''
remove-references-to -t ${dotnet-runtime.unwrapped} "$out/bin/Application"
remove-references-to -t ${dotnet-runtime} "$out/bin/Application"
'';
});
@@ -46,7 +46,7 @@ in
use-dotnet-root-env = testers.testEqualContents {
assertion = "buildDotnetModule uses DOTNET_ROOT from environment in wrapper";
expected = runtimeVersionFile;
actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime.unwrapped}/share/dotnet"; } ''
actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime}/share/dotnet"; } ''
${appWithoutFallback}/bin/Application >"$out"
'';
};
pkgs/top-level/all-packages.nix
-2
View File
@@ -14075,8 +14075,6 @@ with pkgs;
gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { };
gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { };
gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { };
gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { };
pkgs/top-level/python-aliases.nix
+1
View File
@@ -327,6 +327,7 @@ mapAliases ({
linear_operator = linear-operator; # added 2024-01-07
livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14
livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14
lmcloud = pylamarzocco; # added 2024-11-26
logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
logilab_common = logilab-common; # added 2022-11-21
loo-py = loopy; # added 2022-05-03
pkgs/top-level/python-packages.nix
+3 -5
View File
@@ -7581,8 +7581,6 @@ self: super: with self; {
lm-format-enforcer = callPackage ../development/python-modules/lm-format-enforcer { };
lmcloud = callPackage ../development/python-modules/lmcloud { };
lmdb = callPackage ../development/python-modules/lmdb {
inherit (pkgs) lmdb;
};
@@ -11836,6 +11834,8 @@ self: super: with self; {
pylama = callPackage ../development/python-modules/pylama { };
pylamarzocco = callPackage ../development/python-modules/pylamarzocco { };
pylast = callPackage ../development/python-modules/pylast { };
pylatex = callPackage ../development/python-modules/pylatex { };
@@ -16067,9 +16067,7 @@ self: super: with self; {
token-bucket = callPackage ../development/python-modules/token-bucket { };
tokenizers = callPackage ../development/python-modules/tokenizers {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
};
tokenizers = callPackage ../development/python-modules/tokenizers { };
tokenize-rt = callPackage ../development/python-modules/tokenize-rt { };