diff --git a/nixos/modules/services/networking/pihole-ftl-setup-script.nix b/nixos/modules/services/networking/pihole-ftl-setup-script.nix index 692d9fc2b050..944d180dda17 100644 --- a/nixos/modules/services/networking/pihole-ftl-setup-script.nix +++ b/nixos/modules/services/networking/pihole-ftl-setup-script.nix @@ -41,7 +41,8 @@ in local payload="$1" echo "Adding list: $payload" - local result=$(PostFTLData "lists" "$payload") + local type=$($jq -r '.type' <<< "$payload") + local result=$(PostFTLData "lists?type=$type" "$payload") local error="$($jq '.error' <<< "$result")" if [[ "$error" != "null" ]]; then diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 2fd1332d5f9b..2130427813f5 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -149,7 +149,10 @@ in systemd.services.miniflux = { description = "Miniflux service"; wantedBy = [ "multi-user.target" ]; - requires = lib.optional cfg.createDatabaseLocally "miniflux-dbsetup.service"; + requires = lib.optionals cfg.createDatabaseLocally [ + "miniflux-dbsetup.service" + "postgresql.target" + ]; after = [ "network.target" ] diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 1f734199c103..9dfe951e4e5d 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -3,7 +3,7 @@ { name = "buildbot"; - nodes = { + containers = { bbmaster = { pkgs, ... }: { diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index e09b1848882f..68abd2f5f158 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -5,7 +5,7 @@ maintainers = [ mic92 ]; }; - nodes.machine = + containers.machine = { ... }: { services.telegraf.enable = true; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3d8e67def081..401e0b02040c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -571,13 +571,13 @@ "vendorHash": "sha256-01tI68RBp6Qpveqo6Jdynd7SWypbUsY6buPNwdcoPkc=" }, "hashicorp_external": { - "hash": "sha256-rHMmGzYvsE5GT0E71UUIXjDG9+v52LI69/gdP2xuI7w=", + "hash": "sha256-/uBQaDqZBNmIOkwYD+zOPo7ZHiHKDZO2MmD0q52KM4k=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.3.5", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU=" + "vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU=" }, "hashicorp_google": { "hash": "sha256-EXE9etM8gPdrWriF2HJmD5QZY9tDU8dgsusqnvupnKI=", diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 13b5b6fc7b59..f5e6e26b088a 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "cri-o"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; tag = "v${finalAttrs.version}"; - hash = "sha256-aP3qhD2d1x+VPDifkg9lXgVD38UcongyN6vHkn8oYos="; + hash = "sha256-I+oqb8TeI7dBX4ecmEEWNKM7EAdCfGWYv6dpz8emvuA="; }; vendorHash = null; diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index b5635b283dfd..46b0c67c868b 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -128,9 +128,9 @@ in export pnpm_config_pm_on_fail=ignore # Some packages produce platform dependent outputs. We do not want to cache those in the global store - export pnpm_config_side_effects_cache false + export pnpm_config_side_effects_cache=false - export pnpm_config_update_notifier false + export pnpm_config_update_notifier=false else pnpm config set manage-package-manager-versions false pnpm config set side-effects-cache false diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix index 8d237030f25c..f2940fd21ae9 100644 --- a/pkgs/by-name/ar/argon/package.nix +++ b/pkgs/by-name/ar/argon/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "argon"; - version = "2.0.28"; + version = "2.0.29"; src = fetchFromGitHub { owner = "argon-rbx"; repo = "argon"; tag = finalAttrs.version; - hash = "sha256-QXGiDcn5BM1psCZf88gEyKqoK9EDFquLgyzJeZOhwMU="; + hash = "sha256-i2YWAXgrcS759+iNtSzjIHU1FmY22Xx6sy2q9ErGsnw="; }; - cargoHash = "sha256-okfQn/dgBN6s1aO1cnU/bY7BIqwM9iq1iPZ321ez4C4="; + cargoHash = "sha256-wj+T1XBLVQsDNMT9d/0ybR+L7fDZj4Ijhqv0fH+f7HA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/at/atril/package.nix b/pkgs/by-name/at/atril/package.nix index a49be99b9381..fbb6fcf4f974 100644 --- a/pkgs/by-name/at/atril/package.nix +++ b/pkgs/by-name/at/atril/package.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "atril"; - version = "1.28.3"; + version = "1.28.4"; src = fetchFromGitHub { owner = "mate-desktop"; repo = "atril"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-y+J/goOl5ol3j0ySLkyQSndS8zc+dOKhyrPv0FmVkZg="; + hash = "sha256-0BrD897SRf26A4Z1wdizfwoVEEQ7c7EEhAV4vmkBc8E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/ausaxs/package.nix b/pkgs/by-name/au/ausaxs/package.nix index 15e43eae4a9f..17d73244cb61 100644 --- a/pkgs/by-name/au/ausaxs/package.nix +++ b/pkgs/by-name/au/ausaxs/package.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ausaxs"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "AUSAXS"; repo = "AUSAXS"; tag = "v${finalAttrs.version}"; - hash = "sha256-vTuQsg76p0WHPadwqBdDGBSNgNmr5TxuwlNj47P+sa8="; + hash = "sha256-USu0/hfccEnwMccsyQDe1l2hQq9ISQe8WjdduaLJAqs="; }; patches = [ ./cmake-no-fetchcontent.patch ]; @@ -88,10 +88,6 @@ stdenv.mkDerivation (finalAttrs: { cp --recursive --no-preserve=mode ${asio} asio cp --recursive --no-preserve=mode ${cycfi_infra} cycfi_infra patch -p1 -d elements < ${./elements-cmake-no-fetchcontent.patch} - substituteInPlace CMakeLists.txt \ - --replace-fail "-mavx" "${ - lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux) "-msse3" - }" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 8de06ffd3288..da89ced962e0 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -7,7 +7,7 @@ nix-update-script, nixosTests, nodejs, - pnpm_10, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, typescript, @@ -16,12 +16,12 @@ let pname = "autobrr"; - version = "1.78.0"; + version = "1.79.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-iLMeKFDBzSYrCjwvafemSDq8cN3DTzT6KpJzmzgVbYY="; + hash = "sha256-grwXIDN+dYuWaArB76N3xJEVwYlrzopYZJQ+eXRwOY4="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -31,7 +31,7 @@ let nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_11 typescript ]; @@ -44,9 +44,9 @@ let src sourceRoot ; - pnpm = pnpm_10; + pnpm = pnpm_11; fetcherVersion = 3; - hash = "sha256-StLGK3Oezv+M5tuFd1rZyLpG0g1xFxWPJ5lm39Sy0FQ="; + hash = "sha256-zyY54pqlQnYdOyrNZA/WiALzdf4ZGwMLnwm6Mpb0S5k="; }; postBuild = '' @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { src ; - vendorHash = "sha256-POqFXcLtc18EzEQ2SRb2+D+3E8KexaAOelgOSvCwoWI="; + vendorHash = "sha256-9lvzU0tCuiYr0GsLtgG58pxNxoiyj0sT2R8UmYuRD8Y="; preBuild = '' cp -r ${finalAttrs.passthru.autobrr-web}/* web/dist diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix index fdbea9445684..de649f7157d2 100644 --- a/pkgs/by-name/ca/capacities/package.nix +++ b/pkgs/by-name/ca/capacities/package.nix @@ -7,11 +7,11 @@ }: let pname = "capacities"; - version = "1.59.1"; + version = "1.64.6"; src = fetchurl { - url = "https://web.archive.org/web/20260110164323/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/Capacities-1.59.1.AppImage"; - hash = "sha256-zehi0Dl7ts/0JuBVKG+LRtDMfWRjktmIxA0ifqGpbVU="; + url = "https://web.archive.org/web/20260518194627/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.64.6.AppImage"; + hash = "sha256-RCWzvoOhX14FRoPpoAJXMgMjmIevISDzzieiwGnX7uc="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/ci/cine/package.nix b/pkgs/by-name/ci/cine/package.nix index b6d8fe8a6065..b91d84a52a41 100644 --- a/pkgs/by-name/ci/cine/package.nix +++ b/pkgs/by-name/ci/cine/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cine"; - version = "1.1.1"; + version = "1.3.1"; pyproject = false; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Cine"; tag = "v${finalAttrs.version}"; - hash = "sha256-bpyI0xzzs1AdiSC0TdH0HiXRgdWj8sR4G6xO0cYWWPk="; + hash = "sha256-QYNtLTgpyQonmTsLnkwPRxQ14loirii09lJiPdooyOI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index f0e3ffd346d4..3cfeb5cbdad4 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -81,6 +81,12 @@ in }; }).overrideAttrs (oldAttrs: { + autoPatchelfIgnoreMissingDeps = + (oldAttrs.autoPatchelfIgnoreMissingDeps or [ ]) + ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl) [ + "libc.musl-*.so.*" # musl-based node modules are not used on glibc systems + ]; + preFixup = (oldAttrs.preFixup or "") + lib.optionalString hostPlatform.isLinux '' diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index d830572aa9a8..6a8f27340cee 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "3.2.21", + "version": "3.4.16", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/linux/x64/Cursor-3.2.21-x86_64.AppImage", - "hash": "sha256-1OtumCvJbLIoNflh1hrMz2at3k/FrqK+Qvhn/XGI2dU=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/linux/x64/Cursor-3.4.16-x86_64.AppImage", + "hash": "sha256-KSicp27+WSr1qIRUFflRHbxc/eRzcOnWEVQkLYr0ekU=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/linux/arm64/Cursor-3.2.21-aarch64.AppImage", - "hash": "sha256-R51osvw7sP19FbAhPIhHsZYOvEgSW/NhAgyg2N35wAM=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/linux/arm64/Cursor-3.4.16-aarch64.AppImage", + "hash": "sha256-EHRffgia7L7l/WXtODIaeFUpfS5WD9mvwR7muPcycgY=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-Tvty+mDr4q7wRVJacuCxb6HO1QqsFdwm0U7dUY/sPu0=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-g2jrQNiYI2ekIOsaTeWfbvn2gLVDeBzRo4/jvNHNlSY=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-oewHIhqvWJgJzZJ81uBp6zNDOLCXBXcK10MEUSyRDRQ=" + "url": "https://downloads.cursor.com/production/f736016b0aa20ba1f99b7eec1dda48579fa4c295/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-PbU8WqoMyG2/9D7/iWWeqAxEgycH1kGUj7pfH5b4GqI=" } } } diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index b6bf755739f2..8453584321c7 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.130.0"; + version = "0.131.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-YeUeYbzUMUx0lhIKdtPa8vUYK2Cj1hmbLb68Y80r71o="; + hash = "sha256-pWQxDJZO+xbY8aax9QRQRtx/BJw+4CZRL65W3Od4Ep8="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-cpkj7H/jkKGbfJ92Ty9peqfxibFw2aWWG64tmgeG+2o="; + cargoHash = "sha256-CaCYBg8U4pxi3EFBH81k1dWtGY1AL/cZmP9ZtvjDxzw="; # Match upstream's release build for the codex binary only. cargoBuildFlags = [ diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 09569c1acc11..f15596b28d36 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cook-cli"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${finalAttrs.version}"; - hash = "sha256-fg8qq4j9NbQvnduPRBwqp+GyQaHx2axqH39KeMZqy2k="; + hash = "sha256-UwO/pdop4grOuVEq0pSt9DXEQLCXKFrm9HhfQISdBXg="; }; - cargoHash = "sha256-eU/iOb5gHEjWdALeVQr2K3JkD0qOwco3Vkm05HWKdIs="; + cargoHash = "sha256-VobG+Ux56TNM3U2Y51/x59rpg27b2FZXTqpRcKttCEc="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix index ff2863fcca03..dfbf11197fce 100644 --- a/pkgs/by-name/fl/flawfinder/package.nix +++ b/pkgs/by-name/fl/flawfinder/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "flawfinder"; - version = "2.0.19"; + version = "2.0.20"; pyproject = true; src = fetchurl { url = "https://dwheeler.com/flawfinder/flawfinder-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-/lUJgdNwq/oKKWcTRswLA4Ipqb2QsjnqsPAfEiEt9hg="; + sha256 = "sha256-nXMqTg/vHNTq7v1KAJPxg8WYH2yENxHOrmpjQZQEmWs="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/gh/gh-stack/package.nix b/pkgs/by-name/gh/gh-stack/package.nix index b78230c295f9..15cced95ab26 100644 --- a/pkgs/by-name/gh/gh-stack/package.nix +++ b/pkgs/by-name/gh/gh-stack/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "gh-stack"; - version = "0.0.3"; + version = "0.0.4"; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "github"; repo = "gh-stack"; tag = "v${finalAttrs.version}"; - hash = "sha256-CwUDoLLcEsA+dlPDLqQnBLqdtNQwDW6ghmTkyXMpM4M="; + hash = "sha256-sC8QQ4H2WsEVf4FjaWlPvMlVlVc3J6IVmdlqNbJ3M6I="; }; vendorHash = "sha256-JnuqORtdW+xz8pAGAFXdjRey8jCEj+miJiyfY7gzRSU="; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 6b446a00ec00..9cd4d80d1cd5 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -184,11 +184,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "148.0.7778.167"; + version = "148.0.7778.178"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-1k9PrK1mpUJFJ6RbC3ZEN0CqOLX4JbGpmpXQrDpZTVU="; + hash = "sha256-3iuKxcuwt/+BIcUqC715hbeRLhUjepNU1GbB3daIokI="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -302,11 +302,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "148.0.7778.168"; + version = "148.0.7778.179"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/l7nnht2cublegpab37bdleb52y_148.0.7778.168/GoogleChrome-148.0.7778.168.dmg"; - hash = "sha256-HaextZ70Os3EN5mguSmKp0GD0LAy1kE4dWUYwOA+JOs="; + url = "http://dl.google.com/release2/chrome/adxxii2zvsza6zjfnjbfh6fn4tqq_148.0.7778.179/GoogleChrome-148.0.7778.179.dmg"; + hash = "sha256-QBHyF222wnaEmI79CQFOXQl5WkRNwneCYd/JFNMEEWU="; }; dontPatch = true; diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix index 39f1a2d2bee2..fc32575b4948 100644 --- a/pkgs/by-name/go/gopls/package.nix +++ b/pkgs/by-name/go/gopls/package.nix @@ -11,17 +11,17 @@ buildGoLatestModule (finalAttrs: { pname = "gopls"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; tag = "gopls/v${finalAttrs.version}"; - hash = "sha256-D/HBqFy5pNSOhMxx/G102HuL+l+oPljsG8rPNLZjUCs="; + hash = "sha256-JO3FHKBjAGPPuVvrgdc4RZJreiPHbZp+4RwiZubusVg="; }; modRoot = "gopls"; - vendorHash = "sha256-hT0rvmTyniUdZx1ZVd80nJgsWUpOMKkb9VaCAlKM4lk="; + vendorHash = "sha256-mZvjoEgVZ5iNTiduLEC3Oy4RCcxEdVlN6a0Us47IdIQ="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${finalAttrs.version}" ]; diff --git a/pkgs/by-name/kn/knossosnet/deps.json b/pkgs/by-name/kn/knossosnet/deps.json index 2d77d383209b..f49f603e3f4c 100644 --- a/pkgs/by-name/kn/knossosnet/deps.json +++ b/pkgs/by-name/kn/knossosnet/deps.json @@ -201,8 +201,8 @@ }, { "pname": "SharpCompress", - "version": "0.39.0", - "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE=" + "version": "0.48.0", + "hash": "sha256-2MXainbTJeuBwRA6eJU+AlUT8ireNrWxHYNCMkFG8Lc=" }, { "pname": "SkiaSharp", @@ -229,11 +229,6 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, - { - "pname": "System.Buffers", - "version": "4.6.0", - "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" - }, { "pname": "System.IO.Pipelines", "version": "8.0.0", @@ -241,17 +236,12 @@ }, { "pname": "Tmds.DBus.Protocol", - "version": "0.21.2", - "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + "version": "0.21.3", + "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI=" }, { "pname": "WindowsShortcutFactory", "version": "1.2.0", "hash": "sha256-TScGgF++Av8QRSanZ3bIPhYaUEv6RQyAET3NvbKDxWQ=" - }, - { - "pname": "ZstdSharp.Port", - "version": "0.8.4", - "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo=" } ] diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index cf2b56838ef4..96e16c05e9af 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; tag = "v${version}"; - hash = "sha256-5EQ34o1hgQvLfuVMS5l+YFD8wvnQuKioZUQhoImBo28="; + hash = "sha256-zUV+sQdQ71ORKOZzd4yxgRK1HjtZc9wgkmnzz6bG8FA="; }; patches = [ ./dotnet-8-upgrade.patch ]; diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix index c132cbec943d..5dfc67ded1ff 100644 --- a/pkgs/by-name/mu/muvm/package.nix +++ b/pkgs/by-name/mu/muvm/package.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "muvm"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "muvm"; tag = "muvm-${finalAttrs.version}"; - hash = "sha256-eXsU2QRJ55gx5RhjT+m9F1KAFqGrd4WwnyR3eMpuIc4="; + hash = "sha256-9lrJ622kPCfVo/QrtRmLLQs5rjh3FJE8EelqPHdU/vc="; }; - cargoHash = "sha256-OP44LRMN4Lp9LaXQ8Oa8B4LRTqlMyaTa0xKn4eoh1LQ="; + cargoHash = "sha256-Ij2Tdn7HhQ815mXCuamfej4KpDjHALTusrx06t8M87w="; postPatch = '' substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \ diff --git a/pkgs/by-name/ne/netbox_4_5/package.nix b/pkgs/by-name/ne/netbox_4_5/package.nix index 9df6802b9991..4f8ffa396e77 100644 --- a/pkgs/by-name/ne/netbox_4_5/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/package.nix @@ -122,6 +122,15 @@ py.pkgs.buildPythonApplication rec { inherit (nixosTests) netbox-upgrade; }; updateScript = nix-update-script { }; + plugins = lib.recurseIntoAttrs ( + lib.makeExtensible ( + self: + lib.packagesFromDirectoryRecursive { + inherit (py.pkgs) callPackage; + directory = ./plugins; + } + ) + ); }; meta = { diff --git a/pkgs/development/python-modules/netbox-attachments/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-attachments/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-attachments/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-attachments/package.nix diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-bgp/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix diff --git a/pkgs/development/python-modules/netbox-contextmenus/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-contextmenus/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-contract/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-dns/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix diff --git a/pkgs/development/python-modules/netbox-documents/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-documents/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix diff --git a/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-floorplan-plugin/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-interface-synchronization/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-interface-synchronization/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-interface-synchronization/package.nix diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-napalm-plugin/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-napalm-plugin/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-napalm-plugin/package.nix diff --git a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-plugin-prometheus-sd/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-plugin-prometheus-sd/package.nix diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-qrcode/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-qrcode/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-qrcode/package.nix diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-reorder-rack/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix diff --git a/pkgs/development/python-modules/netbox-routing/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-routing/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix similarity index 100% rename from pkgs/development/python-modules/netbox-topology-views/default.nix rename to pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix diff --git a/pkgs/by-name/ne/netcap/ndpi_4_0.nix b/pkgs/by-name/ne/netcap/ndpi_4_14.nix similarity index 86% rename from pkgs/by-name/ne/netcap/ndpi_4_0.nix rename to pkgs/by-name/ne/netcap/ndpi_4_14.nix index 8f63ddcc337a..73adccca7d2e 100644 --- a/pkgs/by-name/ne/netcap/ndpi_4_0.nix +++ b/pkgs/by-name/ne/netcap/ndpi_4_14.nix @@ -11,12 +11,12 @@ ndpi.overrideAttrs ( finalAttrs: prevAttrs: { - version = "4.0"; + version = "4.14"; src = fetchFromGitHub { inherit (prevAttrs.src) owner repo; tag = finalAttrs.version; - hash = "sha256-vWx6IVyxPJBgOkXpHdnvstvDGJbAtndFPtowpjLd32o="; + hash = "sha256-W8ZBWMQH6bRHl+fXmG3XLO37UxEnSgCVCgzfwy8N+OM="; }; configureScript = "./autogen.sh"; diff --git a/pkgs/by-name/ne/netcap/package.nix b/pkgs/by-name/ne/netcap/package.nix index 92768c3334e3..5cd67f88757d 100644 --- a/pkgs/by-name/ne/netcap/package.nix +++ b/pkgs/by-name/ne/netcap/package.nix @@ -8,32 +8,63 @@ libprotoident, libflowmanager, libtrace, + ndpi, + pkg-config, + protobuf, + protoc-gen-go, + yara-x, versionCheckHook, nix-update-script, }: let - ndpi = callPackage ./ndpi_4_0.nix { }; + ndpi_4_14 = callPackage ./ndpi_4_14.nix { }; in buildGoModule (finalAttrs: { pname = "netcap"; - version = "0.6.11"; + version = "0.9.0"; src = fetchFromGitHub { owner = "dreadl0ck"; repo = "netcap"; tag = "v${finalAttrs.version}"; - hash = "sha256-SCBKOIC/s+rfrVWmryp9EBp7ARpZZcxymsnZWtEHrhk="; + hash = "sha256-hk0aPU+pQ+A90GvlFhCRpj4hRiFOcpcP64xznh50Kts="; }; - vendorHash = "sha256-MvHrJLhcFA0fEgK+YT0rwI6wIwTGMcLWQt6AYkx1eZM="; + vendorHash = "sha256-DLjSeSXwA4zPVg3ISPqEHTihIp9uVu7dXv9bTSepsaI="; + + nativeBuildInputs = [ + pkg-config + protobuf + protoc-gen-go + ]; + + postPatch = '' + rm go.work go.work.sum + ''; + + preBuild = '' + # satisfiy go:embed + mkdir -p cmd/capture/webui/frontend/dist + touch cmd/capture/webui/frontend/dist/index.html + + # generate protobuf types + # we need to patch the proto file to have a valid go_package + substituteInPlace netcap.proto --replace-fail 'option go_package = "types";' 'option go_package = "github.com/dreadl0ck/netcap/types";' + protoc --go_out=. --go_opt=paths=source_relative netcap.proto + mv netcap.pb.go types/ + + # Patch types to replace calling String() (panics) with string literal + find types -name "*.go" -exec sed -i 's/Type_NC_\([A-Za-z0-9_]*\).String()/"NC_\1"/g' {} + + ''; subPackages = [ "cmd" ]; buildInputs = [ libpcap + yara-x ] ++ lib.optionals withDpi [ - ndpi + ndpi_4_14 libprotoident libflowmanager libtrace @@ -50,14 +81,14 @@ buildGoModule (finalAttrs: { env = lib.optionalAttrs withDpi { CGO_LDFLAGS = toString [ - "-L${ndpi}/lib" + "-L${ndpi_4_14}/lib" "-lndpi" "-L${libprotoident}/lib" - "-lndpi" + "-lprotoident" ]; CGO_CFLAGS = toString [ - "-I${ndpi}/include" + "-I${ndpi_4_14}/include" "-I${libprotoident}/include" ]; }; diff --git a/pkgs/by-name/ne/netmask/package.nix b/pkgs/by-name/ne/netmask/package.nix index 59847d82c024..0a4101087271 100644 --- a/pkgs/by-name/ne/netmask/package.nix +++ b/pkgs/by-name/ne/netmask/package.nix @@ -3,22 +3,33 @@ stdenv, fetchFromGitHub, autoreconfHook, + autoconf-archive, + pkg-config, texinfo, + check, }: stdenv.mkDerivation (finalAttrs: { pname = "netmask"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "tlby"; repo = "netmask"; rev = "v${finalAttrs.version}"; - sha256 = "1269bmdvl534wr0bamd7cqbnr76pnb14yn8ly4qsfg29kh7hrds6"; + hash = "sha256-BXCZsk+52nygxtY1s4C79WCwy/iOSwgRnQYnauWGipQ="; }; buildInputs = [ texinfo ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + nativeCheckInputs = [ check ]; + + doCheck = true; meta = { homepage = "https://github.com/tlby/netmask"; diff --git a/pkgs/by-name/op/openapi-generator-cli/package.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix index 494e1f1c06dd..817dfca67bce 100644 --- a/pkgs/by-name/op/openapi-generator-cli/package.nix +++ b/pkgs/by-name/op/openapi-generator-cli/package.nix @@ -30,7 +30,7 @@ let "jdk.unsupported" ]; }; - version = "7.21.0"; + version = "7.22.0"; mainProgram = "openapi-generator-cli"; this = maven.buildMavenPackage { inherit version; @@ -41,7 +41,7 @@ let owner = "OpenAPITools"; repo = "openapi-generator"; tag = "v${version}"; - hash = "sha256-3e2JrZ+k88t3CyrkBzwkijs0yZGGwB9Se2CeSB02x6c="; + hash = "sha256-G3MuOJFXVpKNG9Y3JEVMJFxt2wWv1I1dSGuxni4JYdc="; }; patches = [ diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix index 53013299c158..cdf70ae31af8 100644 --- a/pkgs/by-name/op/opengothic/package.nix +++ b/pkgs/by-name/op/opengothic/package.nix @@ -4,12 +4,11 @@ fetchFromGitHub, glslang, lib, + libglvnd, libx11, libxcursor, - libglvnd, makeWrapper, ninja, - nix-update-script, stdenv, vulkan-headers, vulkan-loader, @@ -17,14 +16,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opengothic"; - version = "1.0.3549"; + version = "1.0.3756"; src = fetchFromGitHub { owner = "Try"; repo = "OpenGothic"; - tag = "opengothic-v${finalAttrs.version}"; + rev = "refs/tags/v0.92"; fetchSubmodules = true; - hash = "sha256-dXKZPfV434HHVPgulZZEKhypR6q+uACgmoNWvNQv92w="; + hash = "sha256-6HCBmSjzV3nVDuD/7im6NtWLkDu+V+in2lUloEhp3Cc="; }; nativeBuildInputs = [ @@ -36,24 +35,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib + libglvnd libx11 libxcursor - libglvnd vulkan-headers vulkan-loader vulkan-validation-layers ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "-Werror" "" - ''; - installPhase = '' runHook preInstall install -Dm755 -t $out/bin opengothic/Gothic2Notr - install -Dm755 -t $out/lib opengothic/libTempest.so runHook postInstall ''; @@ -63,15 +56,13 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_PRELOAD : "${lib.getLib alsa-lib}/lib/libasound.so.2" ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex=^opengothic-v(.*)$" ]; - }; + passthru.updateScript = ./update.sh; meta = { description = "Open source re-implementation of Gothic 2: Night of the Raven"; homepage = "https://github.com/Try/OpenGothic"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ azahi ]; + maintainers = [ lib.maintainers.azahi ]; platforms = lib.platforms.linux; mainProgram = "Gothic2Notr"; }; diff --git a/pkgs/by-name/op/opengothic/update.sh b/pkgs/by-name/op/opengothic/update.sh new file mode 100755 index 000000000000..2b60036e784e --- /dev/null +++ b/pkgs/by-name/op/opengothic/update.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p curl jq common-updater-scripts +#! nix-shell -i bash + +set -euo pipefail + +release="$( + curl -s -f \ + ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + "https://api.github.com/repos/Try/OpenGothic/releases?per_page=1" | + jq -r 'first | {version: .name, tag: .tag_name}' +)" +version="$(jq -r .version <<<"$release")" +tag="$(jq -r .tag <<<"$release")" + +update-source-version opengothic "${version//opengothic-v/}" \ + --file=pkgs/by-name/op/opengothic/package.nix \ + --rev="refs/tags/$tag" \ + --print-changes diff --git a/pkgs/by-name/pa/pa-dlna/package.nix b/pkgs/by-name/pa/pa-dlna/package.nix new file mode 100644 index 000000000000..871f73d77572 --- /dev/null +++ b/pkgs/by-name/pa/pa-dlna/package.nix @@ -0,0 +1,69 @@ +{ + lib, + curl, + fetchFromGitLab, + flac, + ffmpeg-headless, + lame, + pulseaudio, + python3, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "pa-dlna"; + version = "1.2"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitLab { + owner = "xdegaye"; + repo = "pa-dlna"; + tag = finalAttrs.version; + hash = "sha256-f0JGJwenKH/4LQv40AhmpYmzAzqkSUhdTBeB4VzqTaQ="; + }; + + postPatch = '' + substituteInPlace pa_dlna/encoders.py \ + --replace-fail "shutil.which('ffmpeg')" "'${lib.getExe ffmpeg-headless}'" \ + --replace-fail "shutil.which('flac')" "'${lib.getExe flac}'" \ + --replace-fail "shutil.which('lame')" "'${lib.getExe lame}'" + substituteInPlace pa_dlna/pa_dlna.py \ + --replace-fail "shutil.which('parec')" "'${lib.getExe' pulseaudio "parec"}'" + substituteInPlace systemd/pa-dlna.service \ + --replace-fail "/usr/bin/pa-dlna" "$out/bin/pa-dlna" + ''; + + build-system = [ python3.pkgs.flit-core ]; + + dependencies = with python3.pkgs; [ + libpulse + psutil + systemd-python + ]; + + postInstall = '' + install systemd/pa-dlna.service -Dt $out/share/systemd/user/ + ''; + + nativeCheckInputs = [ + curl + ffmpeg-headless + python3.pkgs.pytestCheckHook + ]; + + disabledTests = [ + # path to parec is patched and which breaks the mocking + "test_no_parec" + ]; + + pythonImportsCheck = [ "pa_dlna" ]; + + meta = { + description = "UPnP control point forwarding PulseAudio streams to DLNA devices"; + homepage = "https://gitlab.com/xdegaye/pa-dlna"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + mainProgram = "pa-dlna"; + }; +}) diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index e0828ef3143c..0c7fb926911b 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -24,17 +24,18 @@ libsoup_3, libspelling, sqlite, + icu, }: stdenv.mkDerivation (finalAttrs: { pname = "planify"; - version = "4.19.0"; + version = "4.19.3"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; tag = "v${finalAttrs.version}"; - hash = "sha256-swZ8kpfDLxe48PqHLiCjxYbsS7RILCPTPHybtrJi0rA="; + hash = "sha256-811T28jvPTHwNDlR03Ym2f6RPq0N3FLZFqnThBIW1CU="; }; nativeBuildInputs = [ @@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 libspelling sqlite + icu ]; meta = { diff --git a/pkgs/by-name/pl/plutosvg/package.nix b/pkgs/by-name/pl/plutosvg/package.nix index b2f9bd0f5aab..06646aa52a16 100644 --- a/pkgs/by-name/pl/plutosvg/package.nix +++ b/pkgs/by-name/pl/plutosvg/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, validatePkgConfig, testers, @@ -14,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plutosvg"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "sammycage"; repo = "plutosvg"; tag = "v${finalAttrs.version}"; - hash = "sha256-4JLk4+O9Tf8CGxMP0aDN70ak/8teZH3GWBWlrIkPQm4="; + hash = "sha256-+Fo1B9jH/jjcSkrW5Hm6giIYm7zYh7puFFhC6er7XIM="; }; outputs = [ @@ -31,11 +30,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # https://github.com/sammycage/plutosvg/pull/29 ./0001-Emit-correct-pkg-config-file-if-paths-are-absolute.patch - # https://github.com/sammycage/plutosvg/pull/31 - (fetchpatch { - url = "https://github.com/sammycage/plutosvg/commit/17d60020e0b24299fae0e7df37637448b3b51488.patch"; - hash = "sha256-hY25ttsLQwvtQmDeOGSoCVDy34GUA0tNai/L3wpmPUo="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rapid-photo-downloader/package.nix b/pkgs/by-name/ra/rapid-photo-downloader/package.nix index fd4d1d4f2a43..e676aeba5b12 100644 --- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix +++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix @@ -125,7 +125,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Photo and video importer for cameras, phones, and memory cards"; mainProgram = "rapid-photo-downloader"; - homepage = "https://www.damonlynch.net/rapid/"; + homepage = "https://damonlynch.net/rapid/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ philipdb ]; diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix index 9b4c39372831..378092a82707 100644 --- a/pkgs/by-name/ra/rathole/package.nix +++ b/pkgs/by-name/ra/rathole/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rathole-org"; repo = "rathole"; rev = "5a9dd6d939744859af322aeff7fd60f7483a68bc"; - hash = "sha256-C0/G4JOZ4pTAvcKZhRHsGvlLlwAyWBQ0rMScLvaLSuA="; + hash = "sha256-jSwqEJcRv2PwBEY7dV20x9d0GjPb/eZ0w7j1e4YlYH8="; }; # Get rid of git dependency on vergen. No reason to require libgit2-sys as diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 03830fcc199a..17883d931a48 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2026-04-11"; + version = "0-unstable-2026-05-16"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "9e08a6771f196a2d47803e9fcdc6994fa6457509"; - hash = "sha256-I9ghd2mWlujfldeh5LXLSSh5X6CsHu5zlzL8JCcREqk="; + rev = "dce3bb69bb45519bde01c610e09e45cd42fd896c"; + hash = "sha256-QU0LyK9avVT67soPDRpjpYAX0oWoC3zl7PnvHk/w8No="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; diff --git a/pkgs/by-name/su/supernovas/package.nix b/pkgs/by-name/su/supernovas/package.nix index 2131b42e4c9f..cf0cd272c6a5 100644 --- a/pkgs/by-name/su/supernovas/package.nix +++ b/pkgs/by-name/su/supernovas/package.nix @@ -5,16 +5,17 @@ cmake, calceph, withCalceph ? true, + cppSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "supernovas"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { - owner = "smithsonian"; + owner = "Sigmyne"; repo = "supernovas"; tag = "v${finalAttrs.version}"; - hash = "sha256-2M5gBtjCPdVpLU5YsUWVJoRH1YWMZ48ADHwwc3ZJRPk="; + hash = "sha256-sLGl9Lh7bpvxhQ568kmwOMgVxFhH2lDRY/ftX6Oqm2w="; }; nativeBuildInputs = [ @@ -27,8 +28,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "ENABLE_CALCEPH" withCalceph) (lib.cmakeBool "BUILD_EXAMPLES" false) + (lib.cmakeBool "ENABLE_CPP" cppSupport) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) ]; + doCheck = true; + meta = { description = "High-performance astrometry library for C/C++"; homepage = "https://smithsonian.github.io/SuperNOVAS/"; diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix index 08a57e6cdd4c..2d44cd06482a 100644 --- a/pkgs/by-name/sw/swiftformat/package.nix +++ b/pkgs/by-name/sw/swiftformat/package.nix @@ -1,20 +1,21 @@ { lib, fetchFromGitHub, + runCommand, swift, swiftpm, versionCheckHook, nix-update-script, }: -swift.stdenv.mkDerivation rec { +swift.stdenv.mkDerivation (finalAttrs: { pname = "swiftformat"; version = "0.61.1"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-h0d/vdoKZuYJkMO+TmFFgomaSVA94P+MKclSlBlIleE="; }; @@ -34,6 +35,37 @@ swift.stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + + tests.format = + runCommand "swiftformat-test-format" + { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } + '' + export CACHE_DIR=$(mktemp -d) + printf "class Test{\nvar a:Int=1;;\n}" > test.swift + swiftformat --cache $CACHE_DIR --swiftversion 5.8 --indent 2 test.swift 2> stderr.txt + + grep -Fxq "Running SwiftFormat..." stderr.txt + grep -Fxq "1/1 files formatted." stderr.txt + + cat > expected.swift <<'EOF' + class Test { + var a: Int = 1 + } + EOF + + cmp expected.swift test.swift + + swiftformat --cache $CACHE_DIR --swiftversion 5.8 --indent 2 test.swift 2> stderr.txt + + grep -Fxq "Running SwiftFormat..." stderr.txt + grep -Fxq "0/1 files formatted." stderr.txt + + cmp expected.swift test.swift + + touch $out + ''; }; meta = { @@ -46,4 +78,4 @@ swift.stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch b/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch deleted file mode 100644 index b390d492467c..000000000000 --- a/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go -+++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go -@@ -696,7 +696,7 @@ func init() { - // Load protocols - data, err := ioutil.ReadFile("/etc/protocols") - if err != nil { -- if !os.IsNotExist(err) { -+ if !os.IsNotExist(err) && !os.IsPermission(err) { - panic(err) - } - -@@ -732,7 +732,7 @@ func init() { - // Load services - data, err = ioutil.ReadFile("/etc/services") - if err != nil { -- if !os.IsNotExist(err) { -+ if !os.IsNotExist(err) && !os.IsPermission(err) { - panic(err) - } - diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index 6faef182017f..5e5ce315161a 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -10,23 +10,16 @@ buildGoModule (finalAttrs: { pname = "temporal-cli"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-tTPm/2ftCz0G6ytkzsyzQiJDWp48f9nzzY/J2Z1TZjo="; + hash = "sha256-P/wfvKRAvqRgUJabVE9RvT4o3fNZ52JX48hXm3C3orI="; }; - vendorHash = "sha256-/3c1J0i0hr309G7iEmtnc24reqH17Q9E5dxOPufmYQc="; - - overrideModAttrs = old: { - # https://gitlab.com/cznic/libc/-/merge_requests/10 - postBuild = '' - patch -p0 < ${./darwin-sandbox-fix.patch} - ''; - }; + vendorHash = "sha256-dD21m6tlwkZkclYOcYUNlsPXxYmLggjrFTv9XctCIt0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/vc/vcs2l/package.nix b/pkgs/by-name/vc/vcs2l/package.nix index 745bb39ac07f..06158152bc62 100644 --- a/pkgs/by-name/vc/vcs2l/package.nix +++ b/pkgs/by-name/vc/vcs2l/package.nix @@ -5,6 +5,7 @@ git, breezy, subversion, + installShellFiles, }: with python3Packages; @@ -26,6 +27,8 @@ buildPythonApplication (finalAttrs: { setuptools # pkg_resources is imported during runtime ]; + nativeBuildInputs = [ installShellFiles ]; + makeWrapperArgs = [ "--prefix" "PATH" @@ -41,6 +44,11 @@ buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "vcs2l" ]; + postInstall = '' + installShellCompletion $out/share/vcs2l-completion/vcs.{bash,fish,zsh} + rm -rf $out/share/vcs2l-completion + ''; + meta = { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = "https://github.com/ros-infrastructure/vcs2l"; @@ -49,5 +57,6 @@ buildPythonApplication (finalAttrs: { esteve sivteck ]; + mainProgram = "vcs"; }; }) diff --git a/pkgs/by-name/vk/vkdt/package.nix b/pkgs/by-name/vk/vkdt/package.nix index 22ab9fb1b9e7..a5a541521d9d 100644 --- a/pkgs/by-name/vk/vkdt/package.nix +++ b/pkgs/by-name/vk/vkdt/package.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "prefix=" + "VKDT_USE_RAWINPUT=2" "VKDT_USE_MCRAW=false" # TODO: support mcraw ]; diff --git a/pkgs/by-name/vo/voxtype/package.nix b/pkgs/by-name/vo/voxtype/package.nix index bff9339b12f1..c6eefd51c52f 100644 --- a/pkgs/by-name/vo/voxtype/package.nix +++ b/pkgs/by-name/vo/voxtype/package.nix @@ -21,6 +21,7 @@ pciutils, wl-clipboard, wtype, + which, xclip, xdotool, @@ -131,6 +132,7 @@ rustPlatform.buildRustPackage (finalAttrs: { (lib.makeBinPath ( [ libnotify + which ] ++ lib.optionals vulkanSupport [ pciutils diff --git a/pkgs/by-name/zs/zsign/package.nix b/pkgs/by-name/zs/zsign/package.nix index 40f58d68e1c6..e7a946ab4da1 100644 --- a/pkgs/by-name/zs/zsign/package.nix +++ b/pkgs/by-name/zs/zsign/package.nix @@ -4,9 +4,7 @@ stdenv, openssl, pkg-config, - minizip, nix-update-script, - zlib, versionCheckHook, }: let @@ -14,33 +12,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zsign"; - version = "0.9.6"; + version = "1.0.4"; src = fetchFromGitHub { owner = "zhlynn"; repo = "zsign"; tag = "v${finalAttrs.version}"; - hash = "sha256-e4k3W+FkdydqPy3DuhH6MbC+IilLZfqOb7FAbIiv/kM="; + hash = "sha256-NuwV8s+rzsXBha/vqnemvUo6Etm70ZVYL/CZKBJ1szA="; }; - postPatch = '' - substituteInPlace ../../src/common/archive.cpp \ - --replace-fail "#include " "#include " \ - --replace-fail "#include " "#include " - ''; - sourceRoot = "${finalAttrs.src.name}/build/${platformName}"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - minizip - zlib - ]; + buildInputs = [ openssl ]; makeFlags = [ "BINDIR=bin/" "CXX=${stdenv.cc.targetPrefix}c++" + "VERSION=${finalAttrs.version}" ]; installPhase = '' diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 60b534a38e1d..2c3c99413f41 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.17.0"; + version = "11.18.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-plN7FJfPkEu/479JUrCWqpvTmm8CEqRWNurqeOPJUKA="; + hash = "sha256-qQdfU4jOPaHVA9ropmLapS17ng1PDZpAZdhfBTsOPec="; }; - npmDepsHash = "sha256-8rFmFr7IXRbi2LW4diXDOka4nPJGr+DcrB8+JPBxzQA="; + npmDepsHash = "sha256-i9qb/QwqgYfIUh2Nn5yYLRqq0ioVE+g+vt7sSNvnws8="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index dc271a364f8e..370c916452dd 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -15,6 +15,8 @@ matplotlib, pandas, pymc, + pytensor, + seaborn, sparse, # tests @@ -26,24 +28,16 @@ buildPythonPackage (finalAttrs: { pname = "bambi"; - version = "0.17.2"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "bambinos"; repo = "bambi"; tag = finalAttrs.version; - hash = "sha256-Vjv62cYDIuTLE7MxRt4Havy7DMOiMTyIixbs4LGFGGs="; + hash = "sha256-vxsjPYQkqvmB5oKKl29+xq1BPEzBTozz9/W5mICWI4A="; }; - # TypeError: NDArray.record() missing 1 required keyword-only argument: 'in_warmup' - postPatch = '' - substituteInPlace bambi/backend/pymc.py \ - --replace-fail \ - "strace.record(point=dict(zip(varnames, value)))" \ - "strace.record(point=dict(zip(varnames, value)), in_warmup=False)" - ''; - build-system = [ setuptools setuptools-scm @@ -59,6 +53,8 @@ buildPythonPackage (finalAttrs: { matplotlib pandas pymc + pytensor + seaborn sparse ]; @@ -136,8 +132,7 @@ buildPythonPackage (finalAttrs: { disabledTestPaths = [ # Tests require network access - "tests/test_interpret.py" - "tests/test_interpret_messages.py" + "tests/test_interpret_plots.py" ]; pythonImportsCheck = [ "bambi" ]; diff --git a/pkgs/development/python-modules/denon-rs232/default.nix b/pkgs/development/python-modules/denon-rs232/default.nix index 69bb56dbd029..29a4a1d369a0 100644 --- a/pkgs/development/python-modules/denon-rs232/default.nix +++ b/pkgs/development/python-modules/denon-rs232/default.nix @@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "denon-rs232"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { owner = "home-assistant-libs"; repo = "denon-rs232"; tag = finalAttrs.version; - hash = "sha256-SkfxUen1F5cakQao68uYz5uxAkzJfZtVtuIoFGH6mOU="; + hash = "sha256-1GVpF4aOQ8Zzu/abghRF8WJXF+9DP+1suA0F3hy8NSo="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/geoarrow-rust/default.nix b/pkgs/development/python-modules/geoarrow-rust/default.nix new file mode 100644 index 000000000000..f7c5413a6fc4 --- /dev/null +++ b/pkgs/development/python-modules/geoarrow-rust/default.nix @@ -0,0 +1,130 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytestCheckHook, + arro3-core, + pyarrow, + pyproj, + numpy, + pandas, + geoarrow-types, +}: +let + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "geoarrow"; + repo = "geoarrow-rs"; + tag = "py-v${version}"; + hash = "sha256-3/HOQsgQVpEd9iAVvIHvpb0slg55/V6X6KLLvhDUVz4="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src version; + pname = "geoarrow-rust-vendor"; + cargoRoot = "python"; + hash = "sha256-UjLqynlt5Rkx10hlnaY76wDRhJwhNvHmkhpj04Y8/ek="; + }; + + commonMeta = { + homepage = "https://github.com/geoarrow/geoarrow-rs"; + changelog = "https://github.com/geoarrow/geoarrow-rs/releases/tag/py-v${version}"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ daspk04 ]; + }; + + buildGeoArrowPackage = + { + pname, + subdir, + description, + pythonImportsCheck, + dependencies ? [ ], + }: + buildPythonPackage { + inherit + pname + version + src + cargoDeps + dependencies + pythonImportsCheck + ; + pyproject = true; + + sourceRoot = "${src.name}/python/${subdir}"; + cargoRoot = ".."; + __structuredAttrs = true; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + postPatch = '' + chmod -R +w ../.. + ''; + + # set target directory so maturin can find the compiled libraries in this workspace setup + env = { + CARGO_TARGET_DIR = "./target"; + }; + + passthru.tests = { inherit geoarrow-rust-tests; }; + + meta = commonMeta // { + inherit description; + }; + }; + + geoarrow-rust-core = buildGeoArrowPackage { + pname = "geoarrow-rust-core"; + subdir = "geoarrow-core"; + description = "Core library for representing GeoArrow data in Python"; + pythonImportsCheck = [ "geoarrow.rust.core" ]; + dependencies = [ + arro3-core + pyproj + ]; + }; + + geoarrow-rust-io = buildGeoArrowPackage { + pname = "geoarrow-rust-io"; + subdir = "geoarrow-io"; + description = "Rust-based readers and writers for GeoArrow in Python"; + pythonImportsCheck = [ "geoarrow.rust.io" ]; + dependencies = [ + arro3-core + pyproj + ]; + }; + + geoarrow-rust-tests = buildPythonPackage { + pname = "geoarrow-rust-tests"; + inherit src version; + + pyproject = false; + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + pytestCheckHook + geoarrow-types + pandas + pyarrow + numpy + geoarrow-rust-core + geoarrow-rust-io + ]; + + pytestFlags = [ "python" ]; + }; +in +{ + inherit geoarrow-rust-core geoarrow-rust-io; +} diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 38aea828a10b..8e5698898da4 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "holidays"; - version = "0.96"; + version = "0.97"; pyproject = true; src = fetchFromGitHub { owner = "vacanza"; repo = "python-holidays"; tag = "v${finalAttrs.version}"; - hash = "sha256-tsDGtNAF69EzE4cs0j1PeLZBITvy04kG8MUKD2aNWx0="; + hash = "sha256-d543A/A/W4PqWZSwHPRwv7V65EEpzPfugrwlWhHd/mI="; }; build-system = [ diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix index 059ca673e773..50f55bb9f668 100644 --- a/pkgs/development/python-modules/iocsearcher/default.nix +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -20,16 +20,16 @@ solders, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iocsearcher"; - version = "2.7.2"; + version = "2.8.3"; pyproject = true; src = fetchFromGitHub { owner = "malicialab"; repo = "iocsearcher"; - tag = "v${version}"; - hash = "sha256-XoBb3V/2ZMrGV+i0abt7+/xEFqv6f0y99scaw8aav04="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jNITY4X6ywlkjzS5Udpd46JG7PoycXyy0uJ7+UqjuF4="; }; build-system = [ setuptools ]; @@ -61,9 +61,9 @@ buildPythonPackage rec { meta = { description = "Library and command line tool for extracting indicators of compromise (IOCs)"; homepage = "https://github.com/malicialab/iocsearcher"; - changelog = "https://github.com/malicialab/iocsearcher/releases/tag/v${version}"; + changelog = "https://github.com/malicialab/iocsearcher/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "iocsearcher"; }; -} +}) diff --git a/pkgs/development/python-modules/iocx/default.nix b/pkgs/development/python-modules/iocx/default.nix index fdc39b388253..1dc942482971 100644 --- a/pkgs/development/python-modules/iocx/default.nix +++ b/pkgs/development/python-modules/iocx/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + idna, pefile, pytestCheckHook, python-magic, @@ -10,26 +11,25 @@ buildPythonPackage (finalAttrs: { pname = "iocx"; - version = "0.7.0"; + version = "0.7.3"; pyproject = true; src = fetchFromGitHub { owner = "iocx-dev"; repo = "iocx"; tag = "v${finalAttrs.version}"; - hash = "sha256-QLnlxCFVN2hxQtprNuete9iEAy3k4lxJUwbZcPhHMH0="; + hash = "sha256-cCgpkUSlXQm/F8nvpybwt27cicuDAeoHk5t4dYIAsXY="; }; build-system = [ setuptools ]; dependencies = [ + idna pefile python-magic ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "iocx" ]; diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix index 0f2bcac650b1..208cc7dad923 100644 --- a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -1,8 +1,19 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + hatchling, + hatch-jupyter-builder, + + # build inputs jupyterlab, + nodejs, + writableTmpDirAsHomeHook, + yarn-berry_3, + + # dependencies jupyter-packaging, }: @@ -11,26 +22,44 @@ buildPythonPackage rec { version = "3.3.0"; pyproject = true; - src = fetchPypi { - pname = "jupyterlab_execute_time"; - inherit version; - hash = "sha256-kA/Rrrv9PZQ9NiXu+XPu1VW7J0XUmEBAJ4OVnIod/Do="; + src = fetchFromGitHub { + owner = "deshaw"; + repo = "jupyterlab-execute-time"; + rev = "v${version}"; + hash = "sha256-1eNv6yTyorg64PXQm68eqp56Ig0eUbhPWluI/s4oijE="; }; - # jupyterlab is required to build from source but we use the pre-build package + # Fix version requirements and replace jupyterlab's pinned yarn (jlpm) with yarn postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"jupyterlab~=4.0.0"' "" + --replace-fail "jupyterlab~=4.0.0" "jupyterlab" + substituteInPlace pyproject.toml package.json \ + --replace-fail 'jlpm' 'yarn' ''; + build-system = [ + hatchling + hatch-jupyter-builder + ]; + + nativeBuildInputs = [ + jupyterlab + nodejs + writableTmpDirAsHomeHook + yarn-berry_3 + yarn-berry_3.yarnBerryConfigHook + ]; + + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-aCuw+4FqA0JPMr++AgE4WI+KmXda1IosaU2yk/vE7vw="; + }; + dependencies = [ jupyterlab jupyter-packaging ]; - # has no tests - doCheck = false; - pythonImportsCheck = [ "jupyterlab_execute_time" ]; meta = { diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index 21ec72c8f7d0..b4250dc9bdd4 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: { pname = "lancedb"; - version = "0.30.2"; + version = "0.32.0"; pyproject = true; __structuredAttrs = true; @@ -50,14 +50,14 @@ buildPythonPackage (finalAttrs: { owner = "lancedb"; repo = "lancedb"; tag = "python-v${finalAttrs.version}"; - hash = "sha256-k7eVUOnriR91DqVRJP7N9VG75bHAzbDB8bHFLFi5h1w="; + hash = "sha256-oXKlpgGACMVn/86PWQng9NXHpCzdjzikVzVfoAgvQJQ="; }; buildAndTestSubdir = "python"; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-yux18lKMaNOmrmVOYNMo5MMNAO0at5g/0eEsjF97Pes="; + hash = "sha256-rfAhvC6byg134NF21CR5n0A0DL42CLGy7VvHi9aZUrw="; }; build-system = [ rustPlatform.maturinBuildHook ]; diff --git a/pkgs/development/python-modules/libpulse/default.nix b/pkgs/development/python-modules/libpulse/default.nix new file mode 100644 index 000000000000..3b07c0116fbc --- /dev/null +++ b/pkgs/development/python-modules/libpulse/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitLab, + flit-core, + glibcLocales, + libpulseaudio, + pulseaudio, + pytestCheckHook, + stdenv, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "libpulse"; + version = "0.7"; + pyproject = true; + + src = fetchFromGitLab { + owner = "xdegaye"; + repo = "libpulse"; + tag = finalAttrs.version; + hash = "sha256-JxWJaD/9WxvF/lajWWot10/urqGktr4JGGOJRNhbPjk="; + }; + + postPatch = '' + substituteInPlace libpulse/libpulse_ctypes.py \ + --replace-fail "find_library('pulse')" "'${lib.getLib libpulseaudio}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + build-system = [ flit-core ]; + + nativeCheckInputs = [ + glibcLocales + pulseaudio + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + # using pulseaudio as it is easier to setup than pipewire + preCheck = '' + mkdir -p $HOME/.config/pulse/ + cp ${pulseaudio}/etc/pulse/* $HOME/.config/pulse/ + pulseaudio --verbose --daemonize=yes + ''; + + disabledTests = [ + # path to lib is patched and which breaks the mocking + "test_missing_lib" + ]; + + pythonImportsCheck = [ "libpulse" ]; + + meta = { + description = "Asyncio interface to the Pulseaudio and Pipewire pulse library"; + homepage = "https://gitlab.com/xdegaye/libpulse"; + license = lib.licenses.mit; + mainProgram = "pactl-py"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 49e67171bae4..5a078d19f18d 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -20,6 +20,7 @@ pygments, pymdown-extensions, pyyaml, + pyzmq, ruff, starlette, tomlkit, @@ -31,13 +32,13 @@ }: buildPythonPackage rec { pname = "marimo"; - version = "0.21.1"; + version = "0.23.6"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-0YzuyKyptOHe9gJH4avi/sR2q+71Hi0NXRB56jf4b1U="; + hash = "sha256-1jru7h6ep8rHm/JTDaupFRmRU9zk0Vb63nVGR0Z508o="; }; build-system = [ uv-build ]; @@ -56,6 +57,7 @@ buildPythonPackage rec { pygments pymdown-extensions pyyaml + pyzmq ruff starlette tomlkit diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix index 6cd26bb28bf1..e2ac4ab31407 100644 --- a/pkgs/development/python-modules/moreorless/default.nix +++ b/pkgs/development/python-modules/moreorless/default.nix @@ -8,16 +8,16 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "moreorless"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "thatch"; repo = "moreorless"; - tag = "v${version}"; - hash = "sha256-VCvvPxDWriaeKeRaj/YbPLPfNL7fipGwCydr6K0HMjc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uFcNjQLr/rO2hf2ujWWSsOVxfwgAeIxDZ0yskOfBSe4="; }; build-system = [ setuptools-scm ]; @@ -31,18 +31,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "moreorless" ]; - enabledTestPaths = [ - "moreorless/tests/click.py" - "moreorless/tests/combined.py" - "moreorless/tests/general.py" - "moreorless/tests/patch.py" - ]; - meta = { - changelog = "https://github.com/thatch/moreorless/releases/tag/${src.tag}"; description = "Wrapper to make difflib.unified_diff more fun to use"; homepage = "https://github.com/thatch/moreorless/"; + changelog = "https://github.com/thatch/moreorless/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index a618d326079d..cad0d615b67c 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -14,7 +14,6 @@ gitpython, jinja2, jupyter-server, - jupyter-server-mathjax, nbformat, pygments, requests, @@ -22,19 +21,18 @@ # tests gitMinimal, - pytest-tornado, pytestCheckHook, writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "nbdime"; - version = "4.0.3"; + version = "4.0.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-YqtQp1goJSPEUBFEufMUIh27rtBAPBL9cPak/MUy7CQ="; + hash = "sha256-jNJez+61EF1WMjfX9k60dIBY+6m7qas4kqH/YeF3zhY="; }; build-system = [ @@ -48,7 +46,6 @@ buildPythonPackage rec { gitpython jinja2 jupyter-server - jupyter-server-mathjax nbformat pygments requests @@ -57,7 +54,6 @@ buildPythonPackage rec { nativeCheckInputs = [ gitMinimal - pytest-tornado pytestCheckHook writableTmpDirAsHomeHook ]; @@ -91,7 +87,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/jupyter/nbdime"; - changelog = "https://github.com/jupyter/nbdime/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyter/nbdime/blob/v${version}/CHANGELOG.md"; description = "Tools for diffing and merging of Jupyter notebooks"; license = lib.licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index ceff7cd1fdfe..044f93b2cc75 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "ollama"; repo = "ollama-python"; tag = "v${version}"; - hash = "sha256-SpFZ4cu+clvHtjD/Qm6L8Qi9sICWZNE2/l/YXWhAZCo="; + hash = "sha256-kPFimI9h8BL3qQ+puZy70AYnX3zpbZ2nV5revmYPjIY="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index f3a8fb64705b..3cad5136d858 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.7.2"; + version = "6.8.0"; pyproject = true; src = fetchPypi { pname = "oslo_i18n"; inherit version; - hash = "sha256-sSQa0+7iFuncmstDNvzgvXnEwoZ1HucN+kL/L5dj008="; + hash = "sha256-oLTGTBOWhp1xRNymCtl8frAo949h+RxwB1MSOAUZl98="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index e80113d11a1f..fa5c6af59e15 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -7,24 +7,21 @@ pydicom, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyorthanc"; - version = "1.22.1"; - + version = "1.23.0"; pyproject = true; src = fetchFromGitHub { owner = "gacou54"; repo = "pyorthanc"; - tag = "v${version}"; - hash = "sha256-vdrLWDDEMEh7hg+M4FdxiaCC3IJfvuh8fgq+aLPfVJc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-L1vIU6oDZ95lFt2w/TYFpHdmHmDE2XPn10XdEUIlxRQ="; }; build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pydicom" - ]; + pythonRelaxDeps = [ "pydicom" ]; dependencies = [ httpx @@ -38,8 +35,8 @@ buildPythonPackage rec { meta = { description = "Python library that wraps the Orthanc REST API"; homepage = "https://github.com/gacou54/pyorthanc"; - changelog = "https://github.com/gacou54/pyorthanc/releases/tag/${src.tag}"; + changelog = "https://github.com/gacou54/pyorthanc/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-duco-client/default.nix b/pkgs/development/python-modules/python-duco-client/default.nix index 7a079ed02de8..32dd82c536d0 100644 --- a/pkgs/development/python-modules/python-duco-client/default.nix +++ b/pkgs/development/python-modules/python-duco-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "python-duco-client"; - version = "0.4.1"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "ronaldvdmeer"; repo = "python-duco-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-q7Y+66/vJvm05gHyg8mk0vWYySso3DDRvqw6w9hvn9w="; + hash = "sha256-259aAdOltH/Yr+acIhFCe6M/JXCUQS80e8b15wlnVQM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 3bbbfe263e65..0379bd23a3db 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -39,6 +39,8 @@ let checkFlags = [ # requires pgrx to be properly initialized with cargo pgrx init + "--skip=object_utils::tests::parses_managed_postmasters" + # test name in versions < 0.18 "--skip=command::schema::tests::test_parse_managed_postmasters" ]; @@ -60,9 +62,9 @@ in # Not to be used with buildPgrxExtension, where it should be pinned. # When you make an extension use the latest version, *copy* this to a separate pinned attribute. cargo-pgrx = generic { - version = "0.17.0"; - hash = "sha256-Ld7m7ggxlf8FufpeiAE9qcu49X0SgX6XXHS6KIewGyA="; - cargoHash = "sha256-hNj39YzJna8iZxnlrLz+uLduxaD+uvggQRM7ng3MN1k="; + version = "0.18.0"; + hash = "sha256-sBezVDNnyqFQwvFm/CkhlY1zm7Ii2NQPeTfoUQu55e0="; + cargoHash = "sha256-/miOlhZ87fnKT1f+XVaWK4xAzHje8OGVlYl4iU0Sf34="; }; } // lib.mapAttrs (_: generic) (import ./pinned.nix) diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index cfa7dbeb5542..e28b33d117ba 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -402,6 +402,29 @@ rec { done ''; + # verify that l3build works correctly + l3build = + runCommand "texlive-test-l3build" + { + nativeBuildInputs = [ (texliveSmall.withPackages (ps: [ ps.l3build ])) ]; + } + '' + cat >>build.lua <>test-l3build.tex <