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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-07 12:01:21 +00:00 committed by GitHub
commit 75dab3d616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 78 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/aws-c-cal/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-cal";
version = "0.4.5";
version = "0.5.11";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6";
sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc=";
};
nativeBuildInputs = [ cmake ];

27
pkgs/development/ocaml-modules/lwt-canceler/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, fetchFromGitLab, buildDunePackage, lwt }:
buildDunePackage rec {
pname = "lwt-canceler";
version = "0.2";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = "lwt-canceler";
rev = "v${version}";
sha256 = "07931486vg83sl1c268i0vyw61l8n8xs2krjsj43070zljqi8rf1";
};
useDune2 = true;
propagatedBuildInputs = [
lwt
];
doCheck = true;
meta = {
homepage = "https://gitlab.com/nomadic-labs/lwt-canceler";
description = "Cancellation synchronization object";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.8021";
version = "9.0.8761";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DeQvYuVRYOxyVPqHzTSNtEUUN4tHhSVMZoex6SUWik8=";
sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE=";
};
propagatedBuildInputs = [ pyvex ];

11
pkgs/development/python-modules/aiounittest/default.nix
View File

@ -4,20 +4,25 @@
, nose
, coverage
, isPy27
, wrapt
}:
buildPythonPackage rec {
pname = "aiounittest";
version = "1.3.1";
version = "1.4.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "kwarunek";
repo = pname;
rev = version;
sha256 = "0mlic2q49cb0vv62mixy4i4x8c91qb6jlji7khiamcxcg676nasl";
sha256 = "sha256-GbGApY4pQoFpP3RTCLdjjTnJbdz9wEXXzZRRYXgtFEM=";
};
propagatedBuildInputs = [
wrapt
];
checkInputs = [
nose
coverage
@ -27,6 +32,8 @@ buildPythonPackage rec {
nosetests
'';
pythonImportsCheck = [ "aiounittest" ];
meta = with lib; {
description = "Test asyncio code more easily";
homepage = "https://github.com/kwarunek/aiounittest";

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

@ -42,14 +42,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.8021";
version = "9.0.8761";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-brX/HdeZSPOnZKuD1v086GwyWSV8yA/FaMC3CbeI4Xk=";
sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE=";
};
propagatedBuildInputs = [

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.8021";
version = "9.0.8761";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wkCgVVHulu1hGdbUSEi38aMWy2UfR3g/7jj+o+NLI44=";
sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew=";
};
propagatedBuildInputs = [

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

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.8021";
version = "9.0.8761";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j8sPrSaKam5gv1ZlTA3fF1u3UMei9jy843O0n8Hsibc=";
sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg=";
};
checkInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.8021";
version = "9.0.8761";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-btV6J5r4ogb4yC0G3lyXXkCTnx55nfBkWFH1wgiWtjs=";
sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI=";
};
# Use upstream z3 implementation

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

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.8021";
version = "9.0.8761";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pgOeNAzAq2x7MEnheV6txmXISFY/0sWw4cVzs51k4eM=";
sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk=";
};
propagatedBuildInputs = [

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.8021";
version = "9.0.8761";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Bx6A258LgmmRBbrwY2pgf0DXdMwh9QjaA4sVbxj+kBo=";
sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/servers/dns/pdns-recursor/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "pdns-recursor";
version = "4.5.2";
version = "4.5.4";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
sha256 = "1101izvyknxqhzz987j3acsa221ymgrnmyciaz8v7jziai9ksa5i";
sha256 = "0sl98ykk2bh0v2aw2hyak7wk9k3pbhvmfkb3i4a72jlsixm60p81";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/servers/roon-server/default.nix
View File

@ -11,15 +11,15 @@
, zlib
}: stdenv.mkDerivation rec {
pname = "roon-server";
version = "1.8-795";
version = "1.8-806";
# N.B. The URL is unstable. I've asked for them to provide a stable URL but
# they have ignored me. If this package fails to build for you, you may need
# to update the version and sha256.
# c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
src = fetchurl {
url = "https://web.archive.org/web/20210610060249/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
sha256 = "sha256-gC+UquDMyDpgCEYKPp2RRIkHD/4itJssl0hcSEQO5Rc=";
url = "https://web.archive.org/web/20210707070319/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
sha256 = "sha256-TRgsHR71wNz2MoH+RZrIaWEzQSAbo+q8ICKfmmCFy5Y=";
};
buildInputs = [

6
pkgs/servers/sql/mariadb/default.nix
View File

@ -161,6 +161,11 @@ server = stdenv.mkDerivation (common // {
patches = common.patches;
postPatch = ''
substituteInPlace scripts/galera_new_cluster.sh \
--replace ":-mariadb" ":-mysql"
'';
cmakeFlags = common.cmakeFlags ++ [
"-DMYSQL_DATADIR=/var/lib/mysql"
"-DENABLED_LOCAL_INFILE=OFF"
@ -202,7 +207,6 @@ server = stdenv.mkDerivation (common // {
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security
rm -r "$out"/OFF
sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster
'';
# perlPackages.DBDmysql is broken on darwin

4
pkgs/shells/fish/default.nix
View File

@ -134,7 +134,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@ -144,7 +144,7 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-pCFeTKsqWxAbC4hDcgvaPH65jooU3KCVC47xfpQoL6o=";
sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=";
};
# Fix FHS paths in tests

4
pkgs/shells/oil/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "oil";
version = "0.8.11";
version = "0.8.12";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
sha256 = "sha256-GVV+532dPrXkQ3X2+wa4u6aCPBvQAIiypeoqzJqvk9Y=";
sha256 = "sha256-M8JdMru2DDcPWa7qQq9m1NQwjI7kVkHvK5I4W5U1XPU=";
};
postPatch = ''

12
pkgs/tools/graphics/xcolor/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, libX11, libXcursor, libxcb, python3 }:
{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, libX11, libXcursor, libxcb, python3 }:
rustPlatform.buildRustPackage rec {
pname = "xcolor";
@ -11,7 +11,15 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-rHqK05dN5lrvDNbRCWGghI7KJwWzNCuRDEThEeMzmio=";
};
cargoSha256 = "sha256-lHOT/P1Sh1b53EkPIQM3l9Tozdqh60qlUDdjthj32jM=";
cargoPatches = [
# Update Cargo.lock, lexical_core doesn't build on Rust 1.52.1
(fetchpatch {
url = "https://github.com/Soft/xcolor/commit/324d80a18a39a11f2f7141b226f492e2a862d2ce.patch";
sha256 = "sha256-5VzXitpl/gMef40UQBh1EoHezXPyB08aflqp0mSMAVI=";
})
];
cargoSha256 = "sha256-yD4pX+dCJvbDecsdB8tNt1VsEcyAJxNrB5WsZUhPGII=";
nativeBuildInputs = [ pkg-config python3 ];

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

@ -612,6 +612,8 @@ let
ocaml-migrate-parsetree = ocaml-migrate-parsetree-2;
};
lwt-canceler = callPackage ../development/ocaml-modules/lwt-canceler { };
ocaml_lwt = lwt;
lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { };