Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 72a465f8 93380042

+16 -14
+11 -4
pkgs/applications/science/electronics/verilator/default.nix
··· 1 { lib, stdenv, fetchurl 2 - , perl, flex, bison 3 }: 4 5 stdenv.mkDerivation rec { 6 pname = "verilator"; 7 - version = "4.100"; 8 9 src = fetchurl { 10 url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; 11 - sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2"; 12 }; 13 14 enableParallelBuilding = true; 15 buildInputs = [ perl ]; 16 - nativeBuildInputs = [ flex bison ]; 17 18 # these tests need some interpreter paths patched early on... 19 doCheck = false; 20 checkTarget = "test"; 21 22 meta = with lib; { 23 description = "Fast and robust (System)Verilog simulator/compiler";
··· 1 { lib, stdenv, fetchurl 2 + , perl, flex, bison, python3 3 }: 4 5 stdenv.mkDerivation rec { 6 pname = "verilator"; 7 + version = "4.108"; 8 9 src = fetchurl { 10 url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; 11 + sha256 = "00i7am41w9v4smhl64z7s95wdb55f684y89mc0hbc07j1ggc33lf"; 12 }; 13 14 enableParallelBuilding = true; 15 buildInputs = [ perl ]; 16 + nativeBuildInputs = [ flex bison python3 ]; 17 18 # these tests need some interpreter paths patched early on... 19 + # see https://github.com/NixOS/nix/issues/1205 20 doCheck = false; 21 checkTarget = "test"; 22 + 23 + postPatch = '' 24 + patchShebangs \ 25 + src/flexfix \ 26 + src/vlcovgen 27 + ''; 28 29 meta = with lib; { 30 description = "Fast and robust (System)Verilog simulator/compiler";
+1 -1
pkgs/servers/home-assistant/component-packages.nix
··· 2 # Do not edit! 3 4 { 5 - version = "2021.1.2"; 6 components = { 7 "abode" = ps: with ps; [ abodepy ]; 8 "accuweather" = ps: with ps; [ accuweather ];
··· 2 # Do not edit! 3 4 { 5 + version = "2021.1.3"; 6 components = { 7 "abode" = ps: with ps; [ abodepy ]; 8 "accuweather" = ps: with ps; [ accuweather ];
+2 -7
pkgs/servers/home-assistant/default.nix
··· 24 (mkOverride "astral" "1.10.1" 25 "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") 26 27 - # Pinned, because v1.5.0 broke the google_translate integration 28 - # https://github.com/home-assistant/core/pull/38428 29 - (mkOverride "yarl" "1.4.2" 30 - "0jzpgrdl6415zzl8js7095q8ks14555lhgxah76mimffkr39rkaq") 31 - 32 # hass-frontend does not exist in python3.pkgs 33 (self: super: { 34 hass-frontend = self.callPackage ./frontend.nix { }; ··· 62 extraBuildInputs = extraPackages py.pkgs; 63 64 # Don't forget to run parse-requirements.py after updating 65 - hassVersion = "2021.1.2"; 66 67 in with py.pkgs; buildPythonApplication rec { 68 pname = "homeassistant"; ··· 81 owner = "home-assistant"; 82 repo = "core"; 83 rev = version; 84 - sha256 = "0v8a8p524mhf75jnkw5n1fdsr20jwcayyxfba2vg4z8x0n704hxz"; 85 }; 86 87 # leave this in, so users don't have to constantly update their downstream patch handling
··· 24 (mkOverride "astral" "1.10.1" 25 "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") 26 27 # hass-frontend does not exist in python3.pkgs 28 (self: super: { 29 hass-frontend = self.callPackage ./frontend.nix { }; ··· 57 extraBuildInputs = extraPackages py.pkgs; 58 59 # Don't forget to run parse-requirements.py after updating 60 + hassVersion = "2021.1.3"; 61 62 in with py.pkgs; buildPythonApplication rec { 63 pname = "homeassistant"; ··· 76 owner = "home-assistant"; 77 repo = "core"; 78 rev = version; 79 + sha256 = "168njrzvqr3wn1xk02q1yn1f90mf1hds6m8lffgkql8m6a6576hn"; 80 }; 81 82 # leave this in, so users don't have to constantly update their downstream patch handling
+2 -2
pkgs/tools/misc/youtube-dl/default.nix
··· 18 # The websites youtube-dl deals with are a very moving target. That means that 19 # downloads break constantly. Because of that, updates should always be backported 20 # to the latest stable release. 21 - version = "2021.01.08"; 22 23 src = fetchurl { 24 url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; 25 - sha256 = "1k870v9xc7g16nvixa272sdjnmc7pl49ymmnn6rdz0mcj2548h3k"; 26 }; 27 28 nativeBuildInputs = [ installShellFiles makeWrapper ];
··· 18 # The websites youtube-dl deals with are a very moving target. That means that 19 # downloads break constantly. Because of that, updates should always be backported 20 # to the latest stable release. 21 + version = "2021.01.16"; 22 23 src = fetchurl { 24 url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; 25 + sha256 = "1q8pvw5j45k8nvr3d9rvnhi6xaj1mdqlkrg7q7qq6zciq5r54fhi"; 26 }; 27 28 nativeBuildInputs = [ installShellFiles makeWrapper ];