Merge staging-next into staging
This commit is contained in:
commit
72a465f835
@ -1,24 +1,31 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, perl, flex, bison
|
||||
, perl, flex, bison, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "4.100";
|
||||
version = "4.108";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
|
||||
sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2";
|
||||
sha256 = "00i7am41w9v4smhl64z7s95wdb55f684y89mc0hbc07j1ggc33lf";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ perl ];
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
nativeBuildInputs = [ flex bison python3 ];
|
||||
|
||||
# these tests need some interpreter paths patched early on...
|
||||
# see https://github.com/NixOS/nix/issues/1205
|
||||
doCheck = false;
|
||||
checkTarget = "test";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
src/flexfix \
|
||||
src/vlcovgen
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and robust (System)Verilog simulator/compiler";
|
||||
homepage = "https://www.veripool.org/wiki/verilator";
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.1.2";
|
||||
version = "2021.1.3";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
@ -24,11 +24,6 @@ let
|
||||
(mkOverride "astral" "1.10.1"
|
||||
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
|
||||
|
||||
# Pinned, because v1.5.0 broke the google_translate integration
|
||||
# https://github.com/home-assistant/core/pull/38428
|
||||
(mkOverride "yarl" "1.4.2"
|
||||
"0jzpgrdl6415zzl8js7095q8ks14555lhgxah76mimffkr39rkaq")
|
||||
|
||||
# hass-frontend does not exist in python3.pkgs
|
||||
(self: super: {
|
||||
hass-frontend = self.callPackage ./frontend.nix { };
|
||||
@ -62,7 +57,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.1.2";
|
||||
hassVersion = "2021.1.3";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -81,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "0v8a8p524mhf75jnkw5n1fdsr20jwcayyxfba2vg4z8x0n704hxz";
|
||||
sha256 = "168njrzvqr3wn1xk02q1yn1f90mf1hds6m8lffgkql8m6a6576hn";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
@ -18,11 +18,11 @@ buildPythonPackage rec {
|
||||
# The websites youtube-dl deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2021.01.08";
|
||||
version = "2021.01.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1k870v9xc7g16nvixa272sdjnmc7pl49ymmnn6rdz0mcj2548h3k";
|
||||
sha256 = "1q8pvw5j45k8nvr3d9rvnhi6xaj1mdqlkrg7q7qq6zciq5r54fhi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
Loading…
Reference in New Issue
Block a user