Unverified Commit 10b0c338 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Merge remote-tracking branch 'origin/staging-next' into staging

parents d22c20e4 cebf6aa8

pkgs/applications/audio/opustags/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 


stdenv.mkDerivation rec {

  pname = "opustags";

  version = "1.7.0";

  version = "1.8.0";



  src = fetchFromGitHub {

    owner = "fmang";

    repo = "opustags";

    rev = version;

    sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw=";

    sha256 = "sha256-qxtTJ4Hl2ccL+rhONeoOfV6ZyJaWaVDPMsXYJkXCWkY=";

  };



  buildInputs = [ libogg ];

pkgs/applications/misc/hugo/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


buildGoModule rec {

  pname = "hugo";

  version = "0.111.2";

  version = "0.111.3";



  src = fetchFromGitHub {

    owner = "gohugoio";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-UVxE5f+WLIoCEhFh1lbOE8LoXVN/+BzHCpJ61Gqknzc=";

    hash = "sha256-PgconAixlSgRHqmfRdOtcpVJyThZIKAB9Pm4AUvYVGQ=";

  };



  vendorHash = "sha256-xiysjJi3bL0xIoEEo7xXQbznFzwKJrCT6l/bxEbDRUI=";

  vendorHash = "sha256-2a6+s0xLlj3VzXp9zbZgIi7WJShbUQH48tUG9Slm770=";



  doCheck = false;

pkgs/applications/misc/zine/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 


rustPlatform.buildRustPackage rec {

  pname = "zine";

  version = "0.12.1";

  version = "0.13.0";



  src = fetchCrate {

    inherit pname version;

    sha256 = "sha256-54kbSli/cEG8MlbPWC3xauj2VFxru/5haXfHaViUCN8=";

    sha256 = "sha256-N+0FEZ8TUbMs9cwPmURr39wRA+m7B4UbUOkpNmF1p9A=";

  };



  cargoHash = "sha256-youQoyJURmhPZItvfCSytUBpwRrejRf6EzfvjtgXH5E=";

  cargoHash = "sha256-2Mc1hrVJ3a1tE/Jo6MYjCfd03889raVTyLBzhCQi8ck=";



  nativeBuildInputs = [

    pkg-config

pkgs/applications/version-management/bumpver/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ python3.pkgs.buildPythonApplication rec { 


  nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial];



  disabledTests = [

    # fails due to more aggressive setuptools version specifier validation

    "test_parse_default_pattern"

  ];



  meta = with lib; {

    description = "Bump version numbers in project files";

    homepage = "https://pypi.org/project/bumpver/";

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

+32 −3
Original line number Diff line number Diff line 
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytz, pytestCheckHook, freezegun }:

{ lib

, buildPythonPackage

, fetchPypi

, pythonOlder



# tests

, backports-zoneinfo

, freezegun

, pytestCheckHook

, pytz

}:



buildPythonPackage rec {

  pname = "babel";

  version = "2.12.1";

  format = "setuptools";



  disabled = pythonOlder "3.7";



  src = fetchPypi {
@@ -11,12 +23,29 @@ buildPythonPackage rec { 
    hash = "sha256-zC2ZmZzQHURCCuclohyeNxGzqtx5dtYUf2IthYGWNFU=";

  };



  propagatedBuildInputs = lib.optional (pythonOlder "3.9") pytz;

  propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [

    pytz

  ];



  nativeCheckInputs = [

    # via setup.py

    freezegun

    pytestCheckHook

    # via tox.ini

    pytz

  ] ++ lib.optionals (pythonOlder "3.9") [

    backports-zoneinfo

  ];



  nativeCheckInputs = [ pytestCheckHook freezegun ];

  disabledTests = [

    # fails on days switching from and to daylight saving time in EST

    # https://github.com/python-babel/babel/issues/988

    "test_format_time"

  ];



  meta = with lib; {

    homepage = "https://babel.pocoo.org/";

    changelog = "https://github.com/python-babel/babel/releases/tag/v${version}";

    description = "Collection of internationalizing tools";

    license = licenses.bsd3;

    maintainers = with maintainers; [ SuperSandro2000 ];