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

Merge master into staging-next

parents cc157d6c e735fed7

pkgs/by-name/ep/epson-escpr2/package.nix

+9 −23
Original line number Diff line number Diff line
@@ -4,37 +4,23 @@ 
  fetchurl,

  autoreconfHook,

  cups,

  rpm,

  cpio,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "epson-inkjet-printer-escpr2";

  version = "1.2.26";

  version = "1.2.27";



  src = fetchurl {

    # To find the most recent version go to

    # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php

    # and retrieve the download link for source package for x86 CPU

    url = "https://download3.ebz.epson.net/dsc/f/03/00/16/65/06/8fdecc271f6473178d08ffd6b6f6ca2abc92e32f/epson-inkjet-printer-escpr2-1.2.26-1.src.rpm";

    sha256 = "sha256-Js2iZCS9ZzJVRF8PbDA/U1muOne+upq4sA0u+NVIk/0=";

    # and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files)

    url = "https://download3.ebz.epson.net/dsc/f/03/00/16/77/53/1540531c6f47c62d3846d9a8943b1ecec7f825a1/epson-inkjet-printer-escpr2-1.2.27-1.tar.gz";

    hash = "sha256-h1RaqkN+hdVGVy0ancqfYoeNp/TTfJYy5oRxhPizO2Q=";

  };



  unpackPhase = ''

    runHook preUnpack



    rpm2cpio $src | cpio -idmv

    tar xvf ${pname}-${version}-1.tar.gz

    cd ${pname}-${version}



    runHook postUnpack

  '';



  buildInputs = [ cups ];

  nativeBuildInputs = [

    autoreconfHook

    rpm

    cpio

  ];



  patches = [
@@ -51,7 +37,7 @@ stdenv.mkDerivation rec { 
    "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model"

  ];



  meta = with lib; {

  meta = {

    homepage = "http://download.ebz.epson.net/dsc/search/01/search/";

    description = "ESC/P-R 2 Driver (generic driver)";

    longDescription = ''
@@ -60,12 +46,12 @@ stdenv.mkDerivation rec { 


      Refer to the description of epson-escpr for usage.

    '';

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [

      ma9e

      ma27

      shawn8901

    ];

    platforms = platforms.linux;

    platforms = lib.platforms.linux;

  };

}

pkgs/development/python-modules/vallox-websocket-api/default.nix

+2 −7
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  aiohttp,

  buildPythonPackage,

  pythonOlder,

  fetchFromGitHub,

  setuptools,

  construct,
@@ -16,8 +15,6 @@ buildPythonPackage rec { 
  version = "5.4.0";

  pyproject = true;



  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "yozik04";

    repo = "vallox_websocket_api";
@@ -25,13 +22,11 @@ buildPythonPackage rec { 
    hash = "sha256-L9duL8XfDUxHgJxVbG7PPPRJRzVEckxqbB+1vX0GalU=";

  };



  nativeBuildInputs = [

  build-system = [

    setuptools

  ];



  pythonRelaxDeps = [ "websockets" ];



  propagatedBuildInputs = [

  dependencies = [

    aiohttp

    construct

    websockets