From 0840b98db397b0e2569bbe11f424929847dcfefe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:01:14 +0000 Subject: [PATCH 01/17] logseq: 0.3.3 -> 0.3.5 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 46e170f4db17..949eb48f392c 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -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"; }; From 16320ee8d5f1977f144b33936554c9d0a94aeb7c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Sep 2021 04:20:00 +0000 Subject: [PATCH 02/17] postgresqlPackages.pg_hll: 2.15.1 -> 2.16 --- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 4689f176188c..b3fe24bfb953 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -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; From cf698bfe8b9cbb3f39a437cdaa1d03ec76f23c1a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Sep 2021 04:20:00 +0000 Subject: [PATCH 03/17] postgresqlPackages.pg_topn: 2.3.1 -> 2.4.0 --- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index eb0965a33781..3a0c1ea1f26e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -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; }; } From 18e19d4b5a7892bfd4e67a00d0a1c023eb921c65 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 10 Sep 2021 21:17:54 +0200 Subject: [PATCH 04/17] python3Packages.dungeon-eos: init at 0.0.4 --- .../python-modules/dungeon-eos/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/dungeon-eos/default.nix diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix new file mode 100644 index 000000000000..0b1e5ebc53f5 --- /dev/null +++ b/pkgs/development/python-modules/dungeon-eos/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22d654a489fe..84905d96b543 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2247,6 +2247,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 { }; From 462070bddfb3fba1607d744c5fdab6a84094ba65 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Fri, 10 Sep 2021 12:23:31 -0700 Subject: [PATCH 05/17] nix-direnv-flakes: alias flake-enabled nix-direnv --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..4edfc2e15159 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3166,6 +3166,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); From 2f1631a6039792ee215084b89a9a0d7f55c62009 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Fri, 3 Sep 2021 12:28:48 -0400 Subject: [PATCH 06/17] mautrix-facebook: init at 0.3.1 --- pkgs/servers/mautrix-facebook/default.nix | 57 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/servers/mautrix-facebook/default.nix diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix new file mode 100644 index 000000000000..901041578c2f --- /dev/null +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -0,0 +1,57 @@ +{ 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 + ]; + + 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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12d312b657a1..8221471f7621 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6624,6 +6624,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 { }); From 33bbe582996d4941ef059e82be628abfcc32e7c6 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 5 Sep 2021 07:09:46 -0400 Subject: [PATCH 07/17] mautrix-facebook: Support journald logging. --- pkgs/servers/mautrix-facebook/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 901041578c2f..b9e86f01fbdb 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -1,4 +1,5 @@ -{ fetchFromGitHub +{ enableSystemd ? stdenv.isLinux +, fetchFromGitHub , lib , python3 , stdenv @@ -29,7 +30,7 @@ python3.pkgs.buildPythonPackage rec { ruamel_yaml unpaddedbase64 yarl - ]; + ] ++ lib.optional enableSystemd systemd; doCheck = false; From 04c4a6d25ef3033725058b39d0285cec017995a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 02:50:27 +0000 Subject: [PATCH 08/17] python38Packages.azure-mgmt-containerservice: 16.1.0 -> 16.2.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 9d172701bbcc..1f4c78ed1bed 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -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 = [ From 1b9987bfd9678179115c9cacd444e7bad8df3a36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 03:52:51 +0000 Subject: [PATCH 09/17] python38Packages.databricks-connect: 8.1.11 -> 8.1.12 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 1e522059c5be..06a5b227d29a 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -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 = "."; From 09d99a9f49519b4a61a921006a4b7b1d875dd610 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 10 Sep 2021 21:19:09 +0200 Subject: [PATCH 10/17] python3Packages.skytemple-files: 1.2.4 -> 1.3.0 --- .../skytemple-files/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 90fae07c475d..d1ea00b7f3e5 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -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" ]; From 97456cb46ad0cffec86e1b59c75984929df5dc68 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 10 Sep 2021 21:25:43 +0200 Subject: [PATCH 11/17] python3Packages.skytemple-ssb-debugger: 1.2.5 -> 1.3.0 --- .../python-modules/skytemple-ssb-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 745e2775985d..bb91bad3ff1d 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -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 ]; From b435e06df0e199ac54ddd15c91946fd621603215 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 10 Sep 2021 21:29:48 +0200 Subject: [PATCH 12/17] skytemple: 1.2.5 -> 1.3.0 --- pkgs/applications/misc/skytemple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index d341c9821996..a242a520fc45 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -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 = [ From 0ef3a1a1e44a56eb73865c2a97489cdc357a2f64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 09:14:45 +0200 Subject: [PATCH 13/17] python3Packages.python-lsp-server: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/python-lsp-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5d13a50a11fd..8a9fca2c5d0f 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -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="; }; propagatedBuildInputs = [ From 2f9ec5838eb8f1fcfbb5808a482b08b403bfbbdd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Sep 2021 08:16:31 +0000 Subject: [PATCH 14/17] nixos/doc: fix merged items in 20.09 rel notes These items (notmuch and device tree) are completely different topics, so were obviously merged into a single bullet by mistake. --- .../manual/from_md/release-notes/rl-2009.section.xml | 10 +++++++--- nixos/doc/manual/release-notes/rl-2009.section.md | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml index c74d850b2c62..edebd92b327a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml @@ -1684,13 +1684,17 @@ CREATE ROLE postgres LOGIN SUPERUSER; - 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 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 + notmuch.emacs output. + + + + + Device tree overlay support was improved in #79370 and now uses hardware.deviceTree.kernelPackage diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md index 48059ab07f5e..79be2a56a54e 100644 --- a/nixos/doc/manual/release-notes/rl-2009.section.md +++ b/nixos/doc/manual/release-notes/rl-2009.section.md @@ -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`. From 3a31564d2f3bbcb1cff972103075aa4445dba6fa Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 11 Sep 2021 10:24:53 +0200 Subject: [PATCH 15/17] mkvtoolnix: 60.0.0 -> 61.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0f271dd889e8..ebf5de4e00b1 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -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 = [ From b3fd09e93b2bc69ff7b7f46d13e106f06e6f3311 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Sun, 29 Aug 2021 16:59:28 +0200 Subject: [PATCH 16/17] build2: init at 0.13.0 Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: figsoda Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: figsoda Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: Bobby Rong fix mac build and skip phases properly Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: Sandro Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: Sandro Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> Update pkgs/development/tools/build-managers/build2/default.nix Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> --- .../tools/build-managers/build2/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/build-managers/build2/default.nix diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix new file mode 100644 index 000000000000..2e0622ec7e4b --- /dev/null +++ b/pkgs/development/tools/build-managers/build2/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3597b93ea47d..8b5877a91dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13439,6 +13439,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 { }; From 72c2ad9c5a0c08ae113b3cd10d0c579c3ee2c11d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 12:13:15 +0200 Subject: [PATCH 17/17] cargo-audit: 0.15.0 -> 0.15.1 --- pkgs/tools/package-management/cargo-audit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 00b3a65be0d4..82c52419c67c 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -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