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-09-11 12:01:12 +00:00 committed by GitHub
commit 4170ee273c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 168 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/doc/manual/from_md/release-notes/rl-2009.section.xml
View File

@ -1684,13 +1684,17 @@ CREATE ROLE postgres LOGIN SUPERUSER;
</listitem>
<listitem>
<para>
The notmuch package move its emacs-related binaries and emacs
The notmuch package moves its emacs-related binaries and emacs
lisp files to a separate output. They're not part of the
default <literal>out</literal> output anymore - if you relied
on the <literal>notmuch-emacs-mua</literal> binary or the
emacs lisp files, access them via the
<literal>notmuch.emacs</literal> output. Device tree overlay
support was improved in
<literal>notmuch.emacs</literal> output.
</para>
</listitem>
<listitem>
<para>
Device tree overlay support was improved in
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/79370">#79370</link>
and now uses
<link xlink:href="options.html#opt-hardware.deviceTree.kernelPackage">hardware.deviceTree.kernelPackage</link>

4
nixos/doc/manual/release-notes/rl-2009.section.md
View File

@ -578,7 +578,9 @@ When upgrading from a previous release, please be aware of the following incompa
- `services.journald.rateLimitBurst` was updated from `1000` to `10000` to follow the new upstream systemd default.
- The notmuch package move its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output. Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option.
- The notmuch package moves its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output.
- Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option.
- The default output of `buildGoPackage` is now `$out` instead of `$bin`.

4
pkgs/applications/misc/logseq/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.3.3";
version = "0.3.5";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "OweKV+vF8H1QMNhIs0Z9/uUAuu1cCTitH2P7barS0ao=";
sha256 = "ruJALAI0YQNwG8An5VzoJX06Qu/pXZ9zsrPZ7EH+5Pk=";
name = "${pname}-${version}.AppImage";
};

4
pkgs/applications/misc/skytemple/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "skytemple";
version = "1.2.5";
version = "1.3.0";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "0780517gjc97wb2g67pwdv3fz3sqxm2ica1hdbrhqm4rfbnb28xr";
sha256 = "03qmjp257rk4p1zkz89cv26awdgngvakqyg6jc3g6xrhmsvr4r2p";
};
buildInputs = [

4
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -47,13 +47,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "60.0.0";
version = "61.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "sha256-WtEC/EH0G1Tm6OK6hmVRzloLkO8mxxOYYZY7k/Wi2zE=";
sha256 = "04f18jr0a5m1sah8163m28b82w1ikjzmahqy67pbbpzg0mc6rqr4";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "16.1.0";
version = "16.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3654c8ace2b8868d0ea9c4c78c74f51e86e23330c7d8a636d132253747e6f3f4";
sha256 = "ee40fa76d84b82e37e1d8a364649de25bb1e0c6c07f182f145a3ade44ec43711";
};
propagatedBuildInputs = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
version = "8.1.11";
version = "8.1.12";
src = fetchPypi {
inherit pname version;
sha256 = "cd9d1b27edd9345a2a32b365a511f8457c5c1a8f107546fe1ef9063dd15aac00";
sha256 = "84e2db897731461a1d6bccd17923c7e8cd0f2512df018287b62fea55fd61891d";
};
sourceRoot = ".";

23
pkgs/development/python-modules/dungeon-eos/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
pname = "dungeon-eos";
version = "0.0.4";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl";
};
doCheck = false; # there are no tests
pythonImportsCheck = [ "dungeon_eos" ];
meta = with lib; {
homepage = "https://github.com/SkyTemple/dungeon-eos";
description = "A package that simulates PMD EoS dungeon generation";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ marius851000 xfix ];
};
}

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

@ -35,14 +35,14 @@
buildPythonPackage rec {
pname = "python-lsp-server";
version = "1.2.1";
version = "1.2.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-lsp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk=";
sha256 = "sha256-RuZfCvYeO4mthZrg06UhwPp57qvuUI1yYyne5nzIHhE=";
};
postPatch = ''

19
pkgs/development/python-modules/skytemple-files/default.nix
View File

@ -1,26 +1,19 @@
{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }:
{ lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript
, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips
}:
buildPythonPackage rec {
pname = "skytemple-files";
version = "1.2.4";
version = "1.3.0";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "1i3045bqg9h7kcx83nlrm1pmikfpi817n0gb8da29m3mqzk7lwws";
sha256 = "1gpmgdas7x1zmszs9hlxjb6nk683901cy1kc0gyhz0rzdn5jg3lb";
fetchSubmodules = true;
};
patches = [
# fix patching https://github.com/SkyTemple/skytemple-files/pull/128
# merged, remove for next update
(fetchpatch {
url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch";
sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI=";
})
];
postPatch = ''
substituteInPlace skytemple_files/patch/arm_patcher.py \
--replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\""
@ -28,7 +21,7 @@ buildPythonPackage rec {
buildInputs = [ armips ];
propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
doCheck = false; # requires Pokémon Mystery Dungeon ROM
pythonImportsCheck = [ "skytemple_files" ];

4
pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
View File

@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "skytemple-ssb-debugger";
version = "1.2.5";
version = "1.3.0";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "0jkx75z8j03jfr9kzd40ip0fy24sfc7f2x430mf48xin272mc87q";
sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d";
};
buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];

40
pkgs/development/tools/build-managers/build2/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
pname = "build2";
version = "0.13.0";
src = fetchurl {
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
sha256 = "01hmr5y8aa28qchwy9ci8x5q746flwxmlxarmy4w9zay9nmvryms";
};
dontConfigure = true;
dontInstall = true;
buildPhase = ''
runHook preBuild
./build.sh --local --trust yes --install-dir "$out" "$CXX"
runHook postBuild
'';
meta = with lib; {
homepage = "https://www.build2.org/";
description = "build2 build system";
license = licenses.mit;
longDescription = ''
build2 is an open source (MIT), cross-platform build toolchain
that aims to approximate Rust Cargo's convenience for developing
and packaging C/C++ projects while providing more depth and
flexibility, especially in the build system.
build2 is a hierarchy of tools consisting of a general-purpose
build system, package manager (for package consumption), and
project manager (for project development). It is primarily aimed
at C/C++ projects as well as mixed-language projects involving
one of these languages (see bash and rust modules, for example).
'';
platforms = platforms.all;
maintainers = with maintainers; [ hiro98 r-burns ];
};
}

58
pkgs/servers/mautrix-facebook/default.nix Normal file
View File

@ -0,0 +1,58 @@
{ enableSystemd ? stdenv.isLinux
, fetchFromGitHub
, lib
, python3
, stdenv
}:
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-facebook";
version = "0.3.1";
src = fetchFromGitHub {
owner = "mautrix";
repo = "facebook";
rev = "v${version}";
sha256 = "0m7nznx3z6cg4wgvjybdivx22ifxcdri4i8501yibsri0jnpf0y2";
};
propagatedBuildInputs = with python3.pkgs; [
CommonMark
aiohttp
asyncpg
mautrix
paho-mqtt
pillow
prometheus-client
pycryptodome
python-olm
python_magic
ruamel_yaml
unpaddedbase64
yarl
] ++ lib.optional enableSystemd systemd;
doCheck = false;
postPatch = ''
sed -ie 's/^asyncpg.*/asyncpg>=0.20/' requirements.txt
'';
postInstall = ''
mkdir -p $out/bin
cat <<-END >$out/bin/mautrix-facebook
#!/bin/sh
PYTHONPATH="$PYTHONPATH" exec ${python3}/bin/python -m mautrix_facebook "\$@"
END
chmod +x $out/bin/mautrix-facebook
'';
meta = with lib; {
homepage = "https://github.com/mautrix/facebook";
description = "A Matrix-Facebook Messenger puppeting bridge";
license = licenses.agpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ kevincox ];
};
}

6
pkgs/servers/sql/postgresql/ext/pg_hll.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_hll";
version = "2.15.1";
version = "2.16";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-hll";
rev = "refs/tags/v${version}";
sha256 = "17lg05rw7299fvfhdzvznr692c21s5qar1wzzvgwfv7afv6xzr3y";
sha256 = "0icns4m3dkm20fs6gznciwsb8ba8gcc316igz6j7qwjdnyg2ppbf";
};
installPhase = ''
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "HyperLogLog for PostgreSQL";
homepage = "https://github.com/citusdata/postgresql-hll";
changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/citusdata/postgresql-hll/raw/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;

8
pkgs/servers/sql/postgresql/ext/pg_topn.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_topn";
version = "2.3.1";
version = "2.4.0";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-topn";
rev = "refs/tags/v${version}";
sha256 = "0ai07an90ywhk10q52hajgb33va5q76j7h8vj1r0rvq6dyii0wal";
sha256 = "1appxriw7h29kyhv3h6b338g5m2nz70q3mxasy4mjimqhbz1zyqs";
};
installPhase = ''
@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Efficient querying of 'top values' for PostgreSQL";
homepage = "https://github.com/citusdata/postgresql-topn";
changelog = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/citusdata/postgresql-topn/raw/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.agpl3;
license = licenses.agpl3Only;
};
}

6
pkgs/tools/package-management/cargo-audit/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-audit";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "RustSec";
repo = "rustsec";
rev = "cargo-audit%2Fv${version}";
sha256 = "0pvb1m9277ysjzydjvx7viybi6bd23ch7sbjyx1wnz45ahrmia1j";
sha256 = "1rmhizgld35996kzp3fal2zl20aqpnmkzx0clc80n30p814isdrw";
};
cargoSha256 = "0cf8kg8vhfqbrkm227rzyl3394n7fsqhqgq13qks7374h5d04haw";
cargoSha256 = "10li9w3m4xxb8943802y74dgb1wsgjkn74hwn2x47c0w0yjiig7p";
nativeBuildInputs = [
pkg-config

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

@ -3172,6 +3172,7 @@ with pkgs;
nfstrace = callPackage ../tools/networking/nfstrace { };
nix-direnv = callPackage ../tools/misc/nix-direnv { };
nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; };
nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor);
@ -6629,6 +6630,8 @@ with pkgs;
matrix-corporal = callPackage ../servers/matrix-corporal { };
mautrix-facebook = callPackage ../servers/mautrix-facebook { };
mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
@ -13526,6 +13529,8 @@ with pkgs;
buck = callPackage ../development/tools/build-managers/buck { };
build2 = callPackage ../development/tools/build-managers/build2 { };
buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };

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

@ -2251,6 +2251,8 @@ in {
dulwich = callPackage ../development/python-modules/dulwich { };
dungeon-eos = callPackage ../development/python-modules/dungeon-eos { };
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
dyn = callPackage ../development/python-modules/dyn { };