public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-11 12:07:05 +00:00 committed by GitHub
commit 5eb0e65ba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 141 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -89,6 +89,6 @@ mkChromiumDerivation (base: rec {
then ["aarch64-linux" "x86_64-linux"]
else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
broken = elem channel [ "beta" "dev" ];
broken = elem channel [ "dev" ];
};
})

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -159,7 +159,9 @@ let
) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch {
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
});
}) ++ optional (chromiumVersionAtLeast "90")
./fix-missing-atspi2-dependency.patch
;
postPatch = ''
# remove unused third-party

26
pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch Normal file
View File

@ -0,0 +1,26 @@
From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Apr 2021 13:53:50 +0200
Subject: [PATCH] Fix a missing atspi2 dependency
See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for
more details.
---
content/public/browser/BUILD.gn | 1 +
1 file changed, 1 insertion(+)
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 7e7c436d90c7..20ef832f1d8c 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -535,6 +535,7 @@ source_set("browser_sources") {
if (use_atk) {
sources += [ "ax_inspect_factory_auralinux.cc" ]
+ configs += [ "//build/config/linux/atspi2" ]
}
if (is_linux || is_chromeos) {
--
2.20.1

11
pkgs/development/ocaml-modules/janestreet/0.12.nix
View File

@ -1,13 +1,10 @@
{ janePackage
, ctypes
, num
, octavius
, ppxlib
, re
{ self
, openssl
}:
rec {
with self;
{
ocaml-compiler-libs = janePackage {
pname = "ocaml-compiler-libs";

27
pkgs/development/ocaml-modules/janestreet/0.14.nix
View File

@ -1,30 +1,11 @@
{ janePackage
, alcotest
, angstrom
, angstrom-async
, base64
, cryptokit
, ctypes
, dune-configurator
, faraday
, inotify
, js_of_ocaml
, js_of_ocaml-ppx
, lambdasoup
, magic-mime
, num
, octavius
, ppxlib
, re
, tyxml
, uri-sexp
, zarith
{ self
, openssl
, ounit
, zstd
}:
rec {
with self;
{
accessor = janePackage {
pname = "accessor";

10
pkgs/development/ocaml-modules/janestreet/default.nix
View File

@ -1,10 +1,10 @@
{ janePackage, ocamlbuild, angstrom, cryptokit, ctypes,
magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re,
num, openssl
, ppxlib
{ self
, openssl
}:
rec {
with self;
{
ocaml-compiler-libs = janePackage {
pname = "ocaml-compiler-libs";

32
pkgs/development/ocaml-modules/janestreet/old.nix
View File

@ -1,8 +1,32 @@
{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime,
ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num,
openssl }:
{ self
, super
, lib
, stdenv
, openssl
}:
rec {
let
inherit (super)
janePackage
ocaml
ocamlbuild
cryptokit
ctypes
magic-mime
ocaml-migrate-parsetree
octavius
ounit
ppx_deriving
re
zarith
num
;
in
with self;
{
# Jane Street packages, up to ppx_core

15
pkgs/development/ocaml-modules/printbox/default.nix
View File

@ -1,21 +1,24 @@
{ lib, fetchFromGitHub, buildDunePackage, uucp, uutf }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml, uucp, uutf, mdx }:
buildDunePackage rec {
pname = "printbox";
version = "0.4";
version = "0.5";
minimumOCamlVersion = "4.05";
useDune2 = true;
minimumOCamlVersion = "4.03";
src = fetchFromGitHub {
owner = "c-cube";
repo = pname;
rev = version;
sha256 = "0bq2v37v144i00h1zwyqhkfycxailr245n97yff0f7qnidxprix0";
sha256 = "099yxpp7d9bms6dwzp9im7dv1qb801hg5rx6awpx3rpfl4cvqfn2";
};
checkInputs = lib.optionals doCheck [ uucp uutf ];
checkInputs = [ uucp uutf mdx.bin ];
doCheck = true;
# mdx is not available for OCaml < 4.07
doCheck = lib.versionAtLeast ocaml.version "4.07";
meta = {
homepage = "https://github.com/c-cube/printbox/";

4
pkgs/development/python-modules/datadog/default.nix
View File

@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "datadog";
version = "0.39.0";
version = "0.40.0";
src = fetchPypi {
inherit pname version;
sha256 = "b0ef69a27aad0e4412c1ac3e6894fa1b5741db735515c34dfe1606d8cf30e4e5";
sha256 = "4bbd66a02bbcf9cd03ba05194d605a64c9efb7aed90d5e69c6ec42655c3c01a4";
};
postPatch = ''

4
pkgs/development/python-modules/poetry/default.nix
View File

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "poetry";
version = "1.1.4";
version = "1.1.5";
format = "pyproject";
disabled = isPy27;
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "python-poetry";
repo = pname;
rev = version;
sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs";
sha256 = "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf";
};
postPatch = ''

2
pkgs/development/python-modules/snitun/default.nix
View File

@ -22,6 +22,8 @@ buildPythonPackage rec {
# port binding conflicts
"test_snitun_single_runner_timeout"
"test_snitun_single_runner_throttling"
# ConnectionResetError: [Errno 54] Connection reset by peer
"test_peer_listener_timeout"
];
meta = with lib; {

3
pkgs/development/python-modules/transformers/default.nix
View File

@ -8,6 +8,7 @@
, regex
, requests
, numpy
, packaging
, protobuf
, sacremoses
, tokenizers
@ -25,6 +26,8 @@ buildPythonPackage rec {
hash = "sha256-kl1Z2FBo+yqVXUqLaUtet6IycmdcAtfydNTI4MNNrkc=";
};
nativeBuildInputs = [ packaging ];
propagatedBuildInputs = [
cookiecutter
filelock

28
pkgs/os-specific/linux/mdevd/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, skawarePackages }:
with skawarePackages;
buildPackage {
pname = "mdevd";
version = "0.1.3.0";
sha256 = "0spvw27xxd0m6j8bl8xysmgsx18fl769smr6dsh25s2d5h3sp2dy";
description = "mdev-compatible Linux hotplug manager daemon";
platforms = lib.platforms.linux;
outputs = [ "bin" "out" "dev" "doc" ];
configureFlags = [
"--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
"--with-include=${skalibs.dev}/include"
"--with-lib=${skalibs.lib}/lib"
];
postInstall = ''
# remove all mdevd executables from build directory
rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
mv doc $doc/share/doc/mdevd/html
mv examples $doc/share/doc/mdevd/examples
'';
}

11
pkgs/tools/misc/watchexec/default.nix
View File

@ -1,21 +1,21 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "watchexec";
version = "1.14.1";
version = "1.15.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0m4hipjgg64572lzqy9hz4iq9c4awc93c9rmnpap5iyi855x7idj";
sha256 = "1b0ds04q4g8xcgwkziwb5hsi7v73w9y0prvhxz880zzh930652n2";
};
cargoSha256 = "0035pqr61mdx699hd4f8hnxknvsdg67l6ys7gxym3fzd9dcmqqff";
cargoSha256 = "0jpfgyz5l4fdb5cnqmadzjzrvc6dwgray4b0mx80pghpjw8a8qfb";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
postInstall = ''
installManPage doc/watchexec.1
@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/watchexec/watchexec";
license = with licenses; [ asl20 ];
maintainers = [ maintainers.michalrus ];
platforms = platforms.linux ++ platforms.darwin;
};
}

4
pkgs/tools/security/clevis/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "clevis";
version = "15";
version = "16";
src = fetchFromGitHub {
owner = "latchset";
repo = pname;
rev = "v${version}";
sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz";
sha256 = "sha256-DWrxk+Nb2ptF5nCaXYvRY8hAFa/n+6OGdKWO+Sq61yk=";
};
nativeBuildInputs = [ meson ninja pkg-config asciidoc ];

3
pkgs/top-level/all-packages.nix
View File

@ -17270,6 +17270,7 @@ in
s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
s6-rc = callPackage ../tools/system/s6-rc { };
mdevd = callPackage ../os-specific/linux/mdevd { };
nsss = callPackage ../development/libraries/nsss { };
utmps = callPackage ../development/libraries/utmps { };
sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { };
@ -20263,6 +20264,8 @@ in
mdadm = mdadm4;
mdadm4 = callPackage ../os-specific/linux/mdadm { };
inherit (skawarePackages) mdevd;
metastore = callPackage ../os-specific/linux/metastore { };
mingetty = callPackage ../os-specific/linux/mingetty { };

29
pkgs/top-level/ocaml-packages.nix
View File

@ -1255,32 +1255,31 @@ let
janeStreet =
if lib.versionOlder "4.08" ocaml.version
then import ../development/ocaml-modules/janestreet/0.14.nix {
inherit alcotest angstrom angstrom-async base64 cryptokit ctypes
dune-configurator faraday inotify janePackage js_of_ocaml
js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit
ppxlib re tyxml uri-sexp zarith;
inherit self;
inherit (pkgs) openssl zstd;
}
else if lib.versionOlder "4.07" ocaml.version
then import ../development/ocaml-modules/janestreet/0.12.nix {
inherit ctypes janePackage num octavius re;
self = self // {
ppxlib = ppxlib.override { version = "0.8.1"; };
};
inherit (pkgs) openssl;
ppxlib = ppxlib.override { version = "0.8.1"; };
}
else import ../development/ocaml-modules/janestreet {
inherit janePackage ocamlbuild angstrom ctypes cryptokit;
inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
inherit ppx_deriving re;
self = self // {
ppxlib = ppxlib.override { version = "0.8.1"; };
};
inherit (pkgs) openssl;
ppxlib = ppxlib.override { version = "0.8.1"; };
};
janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; };
inherit lib ocaml ocamlbuild ctypes cryptokit;
inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
inherit ppx_deriving re zarith;
inherit (pkgs) stdenv openssl;
self = self.janeStreet_0_9_0;
super = self // {
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {
defaultVersion = "0.9.0";
};
};
inherit (pkgs) stdenv lib openssl;
};
js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {};