Unverified Commit 1b445bb5 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

python312Packages.icalendar: 5.0.13 -> 6.0.0 (#328227)

parents 889dd46a 9787a44e

pkgs/applications/misc/khal/default.nix

+48 −17
Original line number Diff line number Diff line 
{ 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,7 +85,14 @@ 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" \

    PATH="${

      python3.withPackages (

        ps: with ps; [

          sphinx

          sphinxcontrib-newsfeed

        ]

      )

    }/bin:$PATH" \

      make -C doc man

    installManPage doc/build/man/khal.1
@@ -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

pkgs/applications/office/todoman/default.nix

+21 −18
Original line number Diff line number Diff line 
{ 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; [

  ];



  build-system = with python3.pkgs; [

    setuptools-scm

  ]);

  ];



  propagatedBuildInputs = with python3.pkgs; [

  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";

  };

}

pkgs/by-name/au/autosuspend/package.nix

+7 −2
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/icalendar/default.nix

+17 −6
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/python-modules/icalendar/no-dynamic-version.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
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" }