diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index 20186016afd7..c1e5f8cf43e1 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -186,7 +186,8 @@ in { http.docRoot = lib.mkOption { type = with lib.types; nullOr path; - default = null; + default = pkgs.snapweb; + defaultText = lib.literalExpression "pkgs.snapweb"; description = '' Path to serve from the HTTP servers root. ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 84924fe42e5a..fc77ac423b0e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -217,6 +217,7 @@ in preview-tailor = mkHome super.preview-tailor; + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73325 psgml = ignoreCompilationError super.psgml; # elisp error # native-ice https://github.com/mattiase/relint/issues/15 diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index ed745d5708a8..f72d1da79b64 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -757,15 +757,20 @@ let # https://github.com/gongo/airplay-el/issues/2 airplay = addPackageRequires super.airplay [ self.request-deferred ]; - # https://github.com/melpa/melpa/pull/9185 - alectryon = super.alectryon.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --recursive --verbose etc/elisp/screenshot - ''; - }); + alectryon = super.alectryon.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9185 + preBuild = + if lib.versionOlder finalAttrs.version "20241006.1902" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --recursive --verbose etc/elisp/screenshot + '' + else + previousAttrs.preBuild or null; + } + ); # https://github.com/gergelypolonkai/alert-termux/issues/2 alert-termux = addPackageRequires super.alert-termux [ self.alert ]; @@ -803,15 +808,20 @@ let # missing optional dependencies boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ]; - # https://github.com/melpa/melpa/pull/9181 - bpr = super.bpr.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --verbose --force test-bpr.el - ''; - }); + bpr = super.bpr.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9181 + preBuild = + if lib.versionOlder finalAttrs.version "20241013.1803" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --verbose --force test-bpr.el + '' + else + previousAttrs; + } + ); bts = ignoreCompilationError super.bts; # elisp error @@ -853,13 +863,19 @@ let # one optional dependency spark is removed in https://github.com/melpa/melpa/pull/9151 chronometrist = ignoreCompilationError super.chronometrist; - # https://github.com/melpa/melpa/pull/9184 - chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (old: { - recipe = '' - (chronometrist-key-values :fetcher git :url "" - :files (:defaults "elisp/chronometrist-key-values.*")) - ''; - }); + chronometrist-key-values = super.chronometrist-key-values.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9184 + recipe = + if lib.versionOlder finalAttrs.version "20241006.1831" then + '' + (chronometrist-key-values :fetcher git :url "" + :files (:defaults "elisp/chronometrist-key-values.*")) + '' + else + previousAttrs.recipe; + } + ); clingo-mode = super.clingo-mode.overrideAttrs ( finalAttrs: previousAttrs: { @@ -1072,15 +1088,20 @@ let fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error - # https://github.com/melpa/melpa/pull/9182 - frontside-javascript = super.frontside-javascript.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --verbose packages/javascript/test-suppport.el - ''; - }); + frontside-javascript = super.frontside-javascript.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9182 + preBuild = + if lib.versionOlder finalAttrs.version "20240929.1858" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --verbose packages/javascript/test-suppport.el + '' + else + previousAttrs.preBuild or null; + } + ); fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 32c307af6025..b4151a9c5095 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,12 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, glibcLocales -, installShellFiles -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + glibcLocales, + installShellFiles, + python3, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/pimutils/khal/issues/1361 + icalendar = super.icalendar.overridePythonAttrs (old: rec { + version = "5.0.13"; + src = fetchFromGitHub { + owner = "collective"; + repo = "icalendar"; + rev = "refs/tags/v${version}"; + hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; + }; + patches = [ ]; + build-system = with self; [ setuptools ]; + dependencies = with self; [ + python-dateutil + pytz + ]; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "khal"; version = "0.11.3"; pyproject = true; @@ -18,16 +41,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M="; }; + build-system = with python.pkgs; [ + setuptools + setuptools-scm + ]; + nativeBuildInputs = [ glibcLocales installShellFiles - ] ++ (with python3.pkgs; [ - setuptools-scm - sphinx - sphinxcontrib-newsfeed - ]); + ]; - propagatedBuildInputs = with python3.pkgs;[ + dependencies = with python.pkgs; [ atomicwrites click click-log @@ -45,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - nativeCheckInputs = with python3.pkgs;[ + nativeCheckInputs = with python.pkgs; [ freezegun hypothesis packaging @@ -61,8 +85,15 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ - make -C doc man + PATH="${ + python3.withPackages ( + ps: with ps; [ + sphinx + sphinxcontrib-newsfeed + ] + ) + }/bin:$PATH" \ + make -C doc man installManPage doc/build/man/khal.1 # .desktop file @@ -71,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = !stdenv.hostPlatform.isAarch64; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; disabledTests = [ # timing based diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index eae9e424857f..75adb0425cc9 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,30 +1,32 @@ -{ lib -, fetchFromGitHub -, glibcLocales -, installShellFiles -, jq -, python3 +{ + fetchFromGitHub, + installShellFiles, + jq, + lib, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "todoman"; version = "4.4.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "pimutils"; - repo = pname; + repo = "todoman"; rev = "refs/tags/v${version}"; hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; nativeBuildInputs = [ installShellFiles - ] ++ (with python3.pkgs; [ - setuptools-scm - ]); + ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools-scm + ]; + + dependencies = with python3.pkgs; [ atomicwrites click click-log @@ -34,22 +36,18 @@ python3.pkgs.buildPythonApplication rec { parsedatetime python-dateutil pyxdg + pytz tabulate urwid ]; nativeCheckInputs = with python3.pkgs; [ - flake8 - flake8-import-order freezegun hypothesis pytestCheckHook - glibcLocales pytest-cov-stub ]; - LC_ALL = "en_US.UTF-8"; - postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} " @@ -87,9 +85,14 @@ python3.pkgs.buildPythonApplication rec { now. Unsupported fields may not be shown but are never deleted or altered. ''; - changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}"; + changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${ + builtins.replaceStrings [ "." ] [ "-" ] version + }"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ leenaars antonmosich ]; + maintainers = with lib.maintainers; [ + leenaars + antonmosich + ]; mainProgram = "todo"; }; } diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index d2ee518883b5..66fc2152a4e7 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-8P3aa5hjTSlGAolIwiAlPhCg8nx/pfJJE7ZbOsbLsEU="; + sha256 = "sha256-/tjt3hn52NiqEo721K5atnvOLb8iWJ9AlJlaE6cVq3U="; }; buildInputs = [ diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index e1e39918436b..3a3ae71de508 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -1,56 +1,62 @@ { go, cacert, git, lib, stdenv }: { name ? "${args'.pname}-${args'.version}" + # The source used to build the derivation. , src + # Native build inputs used for the derivation. , nativeBuildInputs ? [ ] , passthru ? { } , patches ? [ ] - # A function to override the goModules derivation + # A function to override the `goModules` derivation. , overrideModAttrs ? (finalAttrs: previousAttrs: { }) - # path to go.mod and go.sum directory + # Directory to the `go.mod` and `go.sum` relative to the `src`. , modRoot ? "./" - # vendorHash is the SRI hash of the vendored dependencies - # - # if vendorHash is null, then we won't fetch any dependencies and - # rely on the vendor folder within the source. + # The SRI hash of the vendored dependencies. + # If `vendorHash` is `null`, no dependencies are fetched and + # the build relies on the vendor folder within the source. , vendorHash ? throw ( if args'?vendorSha256 then "buildGoModule: Expect vendorHash instead of vendorSha256" else "buildGoModule: vendorHash is missing" ) + # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false + # Whether to fetch (go mod download) and proxy the vendor directory. # This is useful if your code depends on c code and go mod tidy does not # include the needed sources to build or if any dependency has case-insensitive # conflicts which will produce platform dependant `vendorHash` checksums. , proxyVendor ? false - # We want parallel builds by default + # We want parallel builds by default. , enableParallelBuilding ? true # Do not enable this without good reason - # IE: programs coupled with the compiler + # IE: programs coupled with the compiler. , allowGoReference ? false + # Go env. variable to enable CGO. , CGO_ENABLED ? go.CGO_ENABLED + # Meta data for the final derivation. , meta ? { } - # Not needed with buildGoModule + # Not needed with `buildGoModule`. , goPackagePath ? "" + # Go linker flags. , ldflags ? [ ] - + # Go build flags. , GOFLAGS ? [ ] - # needed for buildFlags{,Array} warning -, buildFlags ? "" -, buildFlagsArray ? "" + # Needed for buildFlags{,Array} warning +, buildFlags ? "" # deprecated +, buildFlagsArray ? "" # deprecated , ... }@args': @@ -79,10 +85,10 @@ in inherit (go) GOOS GOARCH; inherit GO111MODULE GOTOOLCHAIN; - # The following inheritence behavior is not trivial to expect, and some may + # The following inheritance behavior is not trivial to expect, and some may # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and # out in the wild. In anycase, it's documented in: - # doc/languages-frameworks/go.section.md + # doc/languages-frameworks/go.section.md. prePatch = finalAttrs.prePatch or ""; patches = finalAttrs.patches or [ ]; patchFlags = finalAttrs.patchFlags or [ ]; @@ -160,8 +166,8 @@ in outputHashMode = "recursive"; outputHash = finalAttrs.vendorHash; - # Handle empty vendorHash; avoid - # error: empty hash requires explicit hash algorithm + # Handle empty `vendorHash`; avoid error: + # empty hash requires explicit hash algorithm. outputHashAlgo = if finalAttrs.vendorHash == "" then "sha256" else null; # in case an overlay clears passthru by accident, don't fail evaluation }).overrideAttrs (finalAttrs.passthru.overrideModAttrs or overrideModAttrs); @@ -323,7 +329,7 @@ in } // passthru; meta = { - # Add default meta information + # Add default meta information. platforms = go.meta.platforms or lib.platforms.all; } // meta; } diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 479f6d69d736..16217b9f3fd6 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -6,7 +6,8 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "7.0.1"; + version = "7.0.2"; + pyproject = true; disabled = python3.pythonOlder "3.10"; @@ -14,9 +15,13 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Zjo8H5PU6JezrBF0XBHvmePUTNeX74BX4NsHtPozcKs="; + hash = "sha256-QmZX5I1D1iYUQ6Ll0tkbpjzqaOIBaGAltKHwUqLB6uk="; }; + build-system = with python3.pkgs; [ + setuptools + ]; + dependencies = with python3.pkgs; [ dbus-python icalendar diff --git a/pkgs/by-name/sn/snapweb/package.nix b/pkgs/by-name/sn/snapweb/package.nix new file mode 100644 index 000000000000..e3b1673a9180 --- /dev/null +++ b/pkgs/by-name/sn/snapweb/package.nix @@ -0,0 +1,40 @@ +{ + buildNpmPackage, + lib, + fetchFromGitHub, + pkg-config, + vips, +}: + +buildNpmPackage rec { + pname = "snapweb"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "snapweb"; + rev = "v${version}"; + hash = "sha256-rrJmuTFk2dC+GqYmBZ+hu5hx1iknAgSWjr22S7bfmEE="; + }; + + npmDepsHash = "sha256-n1MmU9zHyuEqtQSfYpQ+0hDM0z6ongcFsGyikPMyNSU="; + + # For 'sharp' dependency, otherwise it will try to build it + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ vips ]; + + installPhase = '' + runHook preInstall + + cp -r dist $out/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Web client for Snapcast"; + homepage = "https://github.com/badaix/snapweb"; + maintainers = with maintainers; [ ettom ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index b8424a4593db..acd09406fe32 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-Awr2NvXsWaEeJpdCA94q7kxQ04IDpwNxnm7GxB4J09w=", - "version": "0.2024.10.08.08.02.stable_01" + "hash": "sha256-LPH9JbOXOBjT4vMWNGMvQYDVnTE6p2tFTlOe8HOFsk0=", + "version": "0.2024.10.08.08.02.stable_02" }, "linux_x86_64": { - "hash": "sha256-fNY+wXqlqUSdRVptDNuk1ouddSlIKQrBFPIij9Qa0jM=", - "version": "0.2024.10.08.08.02.stable_01" + "hash": "sha256-jwbwRgQ7WR04zCki7PQuuMZD7v2tFl3Gm1olZ28FAp8=", + "version": "0.2024.10.08.08.02.stable_02" }, "linux_aarch64": { - "hash": "sha256-EdQjc8uXG4cpkgnIYRaBXLeuYqhbN7rs4bU+L/Cc7XA=", - "version": "0.2024.10.08.08.02.stable_01" + "hash": "sha256-Ticn8OMYHWQT88WQSpgcT/kBVnHyoDHNhTk0m4T45bQ=", + "version": "0.2024.10.08.08.02.stable_02" } } diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 9a42e693da28..e4cf47683ec8 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.053"; + version = "1.055"; src = fetchurl { url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-sSokjgsUOTTJnjt8jdgyZRIvbGwJUzwqA99E9e/x5vo="; + sha256 = "sha256-2apGVg/f2FCC8gKlqc5kdo/gxZhmDwEyBqjJwX7NDzY="; }; buildInputs = [ fastjet ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 1170485bf39f..fb88bcfebc84 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -2,17 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, + replaceVars, pythonOlder, - setuptools, + hatch-vcs, + hatchling, backports-zoneinfo, python-dateutil, - pytz, + tzdata, hypothesis, pytestCheckHook, }: buildPythonPackage rec { - version = "5.0.13"; + version = "6.0.1"; pname = "icalendar"; pyproject = true; @@ -20,14 +22,23 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; + hash = "sha256-pcTiXRiHtx7jVzxDkY6WDhzo8sg8fPecqTpRSRIdvfs="; }; - build-system = [ setuptools ]; + patches = [ + (replaceVars ./no-dynamic-version.patch { + inherit version; + }) + ]; + + build-system = [ + hatch-vcs + hatchling + ]; dependencies = [ python-dateutil - pytz + tzdata ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch new file mode 100644 index 000000000000..4754b6441a5f --- /dev/null +++ b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch @@ -0,0 +1,17 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 9730e46..9834686 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -34,11 +34,7 @@ maintainers = [ + { name="Christian Geier" }, + { name="Jaca", email="vitouejj@gmail.com" }, + ] +-# These attributes are dynamically generated by hatch-vcs +-dynamic = [ +- "urls", +- "version" +-] ++version = "@version@" + description = "iCalendar parser/generator" + readme = { file = "README.rst", content-type = "text/x-rst" } + diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 8c0839590676..b5303060948c 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, pytestCheckHook, poetry-core, @@ -25,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4="; }; + patches = [ + (fetchpatch2 { + name = "icalendar-v6-compat.patch"; + url = "https://github.com/jazzband/icalevents/commit/fa925430bd63e46b0941b84a1ae2c9a063f2f720.patch"; + hash = "sha256-MeRC3iJ5raKvl9udzv/44Vs34LxSzq1S6VVKAVFSpiY="; + }) + ]; + build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 3be853d2fc5e..de3e2f377d88 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.0"; + version = "3.3.2"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-1Ggxi61epge6Rxc/vJ7OuuNjjeaQYReEPeOZV8DLghk="; + hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM="; }; build-system = [ setuptools ]; @@ -47,12 +47,6 @@ buildPythonPackage rec { pygments ]; - disabledTests = lib.optionals (lib.versionOlder icalendar.version "6") [ - # ModuleNotFoundError: No module named 'icalendar.timezone' - "test_can_import_zoneinfo" - "test_documentation_file" - ]; - pythonImportsCheck = [ "recurring_ical_events" ]; meta = { diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 4d873e9590f5..507180439589 100644 --- a/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -4,46 +4,43 @@ fetchFromGitHub, setuptools, icalendar, - pytz, + tzdata, pytestCheckHook, restructuredtext-lint, pygments, + pytz, }: buildPythonPackage rec { pname = "x-wr-timezone"; - version = "0.0.7"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "x-wr-timezone"; rev = "v${version}"; - hash = "sha256-itqsVYYUcpbKTh0BM6IHk6F9xhB+pAQnnJsnZAVpNL4="; + hash = "sha256-MDFniFhgRuNtYITH/IUUP/HHC79coqxgXrlErj+Yrcs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar - pytz + tzdata ]; nativeCheckInputs = [ pytestCheckHook restructuredtext-lint pygments + pytz ]; preCheck = '' export PATH=$out/bin:$PATH ''; - disabledTests = [ - "test_input_to_output" - "test_output_stays_the_same" - ]; - pythonImportsCheck = [ "x_wr_timezone" ]; meta = { diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 5f93c5586719..1b33d907afed 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, buildGo123Module +, buildGoModule , fetchFromGitHub , fetchNpmDeps , cacert , git -, go_1_23 +, go , enumer , mockgen , nodejs @@ -14,22 +14,22 @@ , nixosTests }: -buildGo123Module rec { +buildGoModule rec { pname = "evcc"; - version = "0.130.9"; + version = "0.130.13"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-g3z2yqw/84OMui5mchfqVHoR/6LdwNHgeBodf1jUtj4="; + hash = "sha256-cqw+4/GwdBy8XpAF/ViI5UxaaS17hryJSCw5kMLin4k="; }; - vendorHash = "sha256-C2eoNmv0GSi5DV53aUwGcBOw6n2btU/HhniMyu21vLE="; + vendorHash = "sha256-WP7ao54/PMLI+jAaZQgj1otCHEPHZd1A3oqb0DTgx1c="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-60F6j87T77JEt3ej4FVTc8rnnpZSGzomrQp8VPWjv6Q="; + hash = "sha256-pec5hsPrvHHTg++NaLb7vL1YIU1e57o8EVxp9OMhm58="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildGo123Module rec { overrideModAttrs = _: { nativeBuildInputs = [ enumer - go_1_23 + go git cacert mockgen @@ -74,6 +74,7 @@ buildGo123Module rec { # network access "TestOctopusConfigParse" "TestTemplates" + "TestOcpp" ]; in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index c22db465b223..d86ff503e803 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,13 +1,15 @@ -{ lib -, fetchFromGitHub -, python3Packages -, nixosTests +{ + fetchFromGitHub, + fetchpatch2, + lib, + nixosTests, + python3Packages, }: python3Packages.buildPythonApplication rec { pname = "xandikos"; version = "0.2.11"; - format = "pyproject"; + pyproject = true; disabled = python3Packages.pythonOlder "3.9"; @@ -18,12 +20,20 @@ python3Packages.buildPythonApplication rec { hash = "sha256-cBsceJ6tib8OYx5L2Hv2AqRS+ADRSLIuJGIULNpAmEI="; }; - nativeBuildInputs = with python3Packages; [ - setuptools - wheel + patches = [ + (fetchpatch2 { + name = "fix-compatibility-with-icalendar-v6.patch"; + url = "https://github.com/jelmer/xandikos/commit/ae8924c374ed86b2efde5bfbc75e56f6d8318086.patch"; + excludes = [ "requirements.txt" ]; + hash = "sha256-PCKo5C6Ejw9ZsFFLAMw1ZtMoCq9gJxR65K7CM6RUYwU="; + }) ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ aiohttp aiohttp-openmetrics dulwich @@ -31,6 +41,7 @@ python3Packages.buildPythonApplication rec { icalendar jinja2 multidict + pytz vobject ];