Unverified Commit 463abf4d authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 8d9ae4e0 8b33b6c6

pkgs/by-name/pv/pv/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "pv";

  version = "1.10.0";

  version = "1.10.1";



  src = fetchurl {

    url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";

    hash = "sha256-mY5xdBnALuc1rqC41X+cvhES9A9LlHo5uiYRpBW2TaA=";

    hash = "sha256-INOHlLAPqThKHd+eOVqDV6B4LNlci3TPHfjfY4iVDuw=";

  };



  meta = {

pkgs/development/libraries/mesa/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
    "asahi" # Apple AGX

    "crocus" # Intel legacy

    "d3d12" # WSL emulated GPU (aka Dozen)

    "ethosu" # ARM Ethos NPU

    "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)

    "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)

    "i915" # Intel extra legacy
@@ -63,7 +62,6 @@ 
    "r300" # very old AMD

    "r600" # less old AMD

    "radeonsi" # new AMD (GCN+)

    "rocket" # Rockchip NPU

    "softpipe" # older software renderer

    "svga" # VMWare virtualized GPU

    "tegra" # Nvidia Tegra SoCs
@@ -71,6 +69,10 @@ 
    "vc4" # Broadcom VC4 (Raspberry Pi 0-3)

    "virgl" # QEMU virtualized GPU (aka VirGL)

    "zink" # generic OpenGL over Vulkan, experimental

  ]

  ++ lib.optionals stdenv.hostPlatform.is64bit [

    "ethosu" # ARM Ethos NPU, does not build on 32-bit

    "rocket" # Rockchip NPU, probably horribly broken on 32-bit

  ],

  vulkanDrivers ? [

    "amd" # AMD (aka RADV)

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

+10 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  backoff,

  buildPythonPackage,

  fetchFromGitHub,

  pythonOlder,

  fetchpatch,

  reverse-geocode,

  setuptools-scm,

  yarl,
@@ -15,8 +15,6 @@ buildPythonPackage rec { 
  version = "0.3.0";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "Sholofly";

    repo = "geocachingapi-python";
@@ -24,6 +22,15 @@ buildPythonPackage rec { 
    hash = "sha256-zme1jqn3qtoo39zyj4dKxt9M7gypMqJu0bfgY1iYhjs=";

  };



  patches = [

    # https://github.com/Sholofly/geocachingapi-python/pull/25

    (fetchpatch {

      name = "replace-async-timeout-with-asyncio.timeout.patch";

      url = "https://github.com/Sholofly/geocachingapi-python/commit/2ba042bc2a6ebb4a494f71821502df4534eeb1a1.patch";

      hash = "sha256-AtjZJ9tnBeOv76fVIiqY45MeYTzcWvXCtbc6DevH8aM=";

    })

  ];



  build-system = [ setuptools-scm ];



  dependencies = [