Merge master into staging-next
This commit is contained in:
commit
be6e431001
10 changed files with 430 additions and 408 deletions
|
@ -7150,7 +7150,7 @@
|
|||
name = "Paulus Esterhazy";
|
||||
};
|
||||
petabyteboy = {
|
||||
email = "me@pbb.lc";
|
||||
email = "milan@petabyte.dev";
|
||||
github = "petabyteboy";
|
||||
githubId = 3250809;
|
||||
name = "Milan Pässler";
|
||||
|
|
|
@ -156,6 +156,16 @@ in
|
|||
description = "List of modules that are always loaded by the initrd.";
|
||||
};
|
||||
|
||||
boot.initrd.includeDefaultModules = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
This option, if set, adds a collection of default kernel modules
|
||||
to <option>boot.initrd.availableKernelModules</option> and
|
||||
<option>boot.initrd.kernelModules</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
system.modulesTree = mkOption {
|
||||
type = types.listOf types.path;
|
||||
internal = true;
|
||||
|
@ -195,7 +205,8 @@ in
|
|||
config = mkMerge
|
||||
[ (mkIf config.boot.initrd.enable {
|
||||
boot.initrd.availableKernelModules =
|
||||
[ # Note: most of these (especially the SATA/PATA modules)
|
||||
optionals config.boot.initrd.includeDefaultModules ([
|
||||
# Note: most of these (especially the SATA/PATA modules)
|
||||
# shouldn't be included by default since nixos-generate-config
|
||||
# detects them, but I'm keeping them for now for backwards
|
||||
# compatibility.
|
||||
|
@ -235,10 +246,11 @@ in
|
|||
|
||||
# x86 RTC needed by the stage 2 init script.
|
||||
"rtc_cmos"
|
||||
];
|
||||
]);
|
||||
|
||||
boot.initrd.kernelModules =
|
||||
[ # For LVM.
|
||||
optionals config.boot.initrd.includeDefaultModules [
|
||||
# For LVM.
|
||||
"dm_mod"
|
||||
];
|
||||
})
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.1.0";
|
||||
version = "1.1.2";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nzkzx870hzil2kny1irp4w2kxz5gmpchr2qxb7q4f9cnih92n0j";
|
||||
sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase cpp-utilities qtutilities ]
|
||||
|
|
|
@ -201,6 +201,6 @@ stdenv.mkDerivation {
|
|||
url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/";
|
||||
};
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
maintainers = with maintainers; [ taku0 ];
|
||||
maintainers = with maintainers; [ taku0 lovesegfault ];
|
||||
};
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -7,16 +7,16 @@ in
|
|||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "85.0";
|
||||
ffversion = "85.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "17bx4782ix3nrjnc6y29bz86lkpc2fzapqraa67xi65m46qrn0cs9hwdjyl48rdc44j5972gilpmd217kfxf4wxrfc2vcxadgk75158";
|
||||
sha512 = "0i0x1jvwrjvbdz90dgmf7lw3qj56y37nf5h3qs55263d0jgvnkqfc5dgjfzrq51z5a546lmbs4p97qiaf2p3d5wiv3lx8cw43n74axd";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A web browser built from Firefox source tree";
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ eelco ];
|
||||
maintainers = with lib.maintainers; [ eelco lovesegfault ];
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
|
@ -32,10 +32,10 @@ rec {
|
|||
|
||||
firefox-esr-78 = common rec {
|
||||
pname = "firefox-esr";
|
||||
ffversion = "78.7.0esr";
|
||||
ffversion = "78.7.1esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "0606prndxfv9nvrpcnagwky04j4jhn1139gr72a0rydfagznsaqwy13gpzdf58ifycdln63052kchlh2dslz5m8hifp215ydcppv8xg";
|
||||
sha512 = "138dcfpdkp78yqgygac212vg5fm5ich2a82p7258ch8hk6bpvpdxbws4sdqwljs92x831dblcsshwkl06vh48899489gx87mdkqd0nm";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -133,5 +133,10 @@ in stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
knownVulnerabilities = [
|
||||
"https://security.libvirt.org/2019/0008.html"
|
||||
"https://security.libvirt.org/2019/0009.html"
|
||||
"https://security.libvirt.org/2020/0001.html"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, zlib
|
||||
, xz
|
||||
, ncompress
|
||||
|
@ -20,22 +21,20 @@
|
|||
, pyqtgraph
|
||||
, visualizationSupport ? false }:
|
||||
|
||||
let
|
||||
version = "2.2.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "binwalk";
|
||||
inherit version;
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devttys0";
|
||||
owner = "ReFirmLabs";
|
||||
repo = "binwalk";
|
||||
rev = "be738a52e09b0da2a6e21470e0dbcd5beb42ed1b";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ]
|
||||
++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
|
||||
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ]
|
||||
++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ];
|
||||
|
||||
# setup.py only installs version.py during install, not test
|
||||
postPatch = ''
|
||||
|
@ -49,6 +48,8 @@ buildPythonPackage {
|
|||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
pythonImportsCheck = [ "binwalk" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ReFirmLabs/binwalk";
|
||||
description = "A tool for searching a given binary image for embedded files";
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
pname = "tempo";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
sha256 = "16hrvhnlciaf06l34p3bb3nvmxr8zwbh7zql13zja1hs0kvwxv5c";
|
||||
sha256 = "sha256-Har0JJqr6mkliKh25n+F4tork+bzfI/bv19H/rIRb9g=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -13775,6 +13775,10 @@ in
|
|||
rev = "v${version}";
|
||||
sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad";
|
||||
};
|
||||
meta.knownVulnerabilities = [
|
||||
"CVE-2020-12278"
|
||||
"CVE-2020-12279"
|
||||
];
|
||||
});
|
||||
|
||||
libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
|
||||
|
|
Loading…
Reference in a new issue