Unverified Commit 2d1ef463 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 34b62f7c 31513aaf

nixos/lib/testing/nodes.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ let 
    types

    ;



  inherit (hostPkgs) hostPlatform;

  inherit (hostPkgs.stdenv) hostPlatform;



  guestSystem =

    if hostPlatform.isLinux

pkgs/by-name/le/lefthook/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


let

  pname = "lefthook";

  version = "1.7.17";

  version = "1.8.1";

in

buildGoModule {

  inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule { 
    owner = "evilmartians";

    repo = "lefthook";

    rev = "v${version}";

    hash = "sha256-r7Tss0NHdEfjfDunWSTxpaV1B5KHGYu0xj9nnyhk8tQ=";

    hash = "sha256-a4fghI3iUPnfYSQUR5LoH0eQfSqRMTcW4umeb/PhDt4=";

  };



  vendorHash = "sha256-rJdtax3r5Nwew+ptY4kIAUtxqPguwrFMMRk78zrZUcU=";

  vendorHash = "sha256-dxL+t5tPL+vsiBk+ojtQKcNubO0A72+7DWblxXiwzPE=";



  nativeBuildInputs = [ installShellFiles ];

pkgs/by-name/nu/numbat/package.nix

+20 −22
Original line number Diff line number Diff line 
{ lib

, stdenv

, testers

, fetchFromGitHub

, fetchpatch

, rustPlatform

, darwin

, numbat

, tzdata

{

  lib,

  stdenv,

  testers,

  fetchFromGitHub,

  rustPlatform,

  darwin,

  numbat,

  tzdata,

}:



rustPlatform.buildRustPackage rec {

  pname = "numbat";

  version = "1.13.0";

  version = "1.14.0";



  src = fetchFromGitHub {

    owner = "sharkdp";

    repo = "numbat";

    rev = "v${version}";

    hash = "sha256-o3EYhMFBgs/Ni+YCM3+RdUYlwRt+nMaEP/cAkDXMVHc=";

    hash = "sha256-TmzM541S2W5Cy8zHEWKRE2Zj2bSgrM4vbsWw3zbi3LQ=";

  };



  cargoHash = "sha256-rK9RPd/hww2F87l/dd14pB4izE58NuqaewYaqMimV1M=";



  patches = [

    # https://github.com/sharkdp/numbat/pull/562

    (fetchpatch {

      url = "https://github.com/sharkdp/numbat/commit/4756a1989ecdab35fd05ca18c721ed15d8cde2b1.patch";

      hash = "sha256-22+yePjy+MxJQ60EdvgaTw/IVV0d/wS2Iqza1p1xmfk=";

    })

  ];

  cargoHash = "sha256-exvJJsGIj6KhmMcwhPjXMELvisuUtl17BAO6XEJSJmI=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    darwin.apple_sdk.frameworks.Security
@@ -60,9 +52,15 @@ rustPlatform.buildRustPackage rec { 
    '';

    homepage = "https://numbat.dev";

    changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";

    license = with licenses; [ asl20 mit ];

    license = with licenses; [

      asl20

      mit

    ];

    mainProgram = "numbat";

    maintainers = with maintainers; [ giomf atemu ];

    maintainers = with maintainers; [

      giomf

      atemu

    ];

    # Failing tests on Darwin.

    broken = stdenv.isDarwin;

  };

pkgs/by-name/st/stalwart-mail/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ rustPlatform.buildRustPackage { 
  doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);



  passthru = {

    inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)

    webadmin = callPackage ./webadmin.nix { };

    updateScript = nix-update-script { };

    tests.stalwart-mail = nixosTests.stalwart-mail;

pkgs/development/python-modules/django-crossdomainmedia/default.nix

0 → 100644
+41 −0
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  django,

  pytestCheckHook,

  pytest-django,

  python,

}:



buildPythonPackage rec {

  pname = "django-crossdomainmedia";

  version = "0.0.4";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = "stefanw";

    repo = "django-crossdomainmedia";

    # Release is not tagged yet

    # https://github.com/stefanw/django-crossdomainmedia/issues/1

    # rev = "refs/tags/v${version}";

    rev = "45af45a82e2630d99381758c7660fe9bdad06d2d";

    hash = "sha256-nwFUm+cxokZ38c5D77z15gIO/kg49oRACOl6+eGGEtQ=";

  };



  dependencies = [ django ];



  checkPhase = ''

    ${python.interpreter} manage.py test

  '';



  # django.core.exceptions.ImproperlyConfigured: Requested setting DEBUG, but settings are not configured.

  # pythonImportsCheck = [ "crossdomainmedia" ];



  meta = {

    description = "Django application to retrieve user's IP address";

    homepage = "https://github.com/stefanw/django-crossdomainmedia";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.onny ];

  };

}