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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
- pkgs/development/python-modules/rich/default.nix
- pkgs/servers/mautrix-facebook/default.nix
- pkgs/servers/mautrix-googlechat/default.nix
- pkgs/servers/mautrix-signal/default.nix
- pkgs/top-level/python-aliases.nix
This commit is contained in:
Martin Weinelt 2023-03-12 19:23:14 +01:00
commit 4bfe4794fa
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/opustags/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opustags"; pname = "opustags";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fmang"; owner = "fmang";
repo = "opustags"; repo = "opustags";
rev = version; rev = version;
sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw="; sha256 = "sha256-qxtTJ4Hl2ccL+rhONeoOfV6ZyJaWaVDPMsXYJkXCWkY=";
}; };
buildInputs = [ libogg ]; buildInputs = [ libogg ];

6
pkgs/applications/misc/hugo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.111.2"; version = "0.111.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-UVxE5f+WLIoCEhFh1lbOE8LoXVN/+BzHCpJ61Gqknzc="; hash = "sha256-PgconAixlSgRHqmfRdOtcpVJyThZIKAB9Pm4AUvYVGQ=";
}; };
vendorHash = "sha256-xiysjJi3bL0xIoEEo7xXQbznFzwKJrCT6l/bxEbDRUI="; vendorHash = "sha256-2a6+s0xLlj3VzXp9zbZgIi7WJShbUQH48tUG9Slm770=";
doCheck = false; doCheck = false;

6
pkgs/applications/misc/zine/default.nix
View File

@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zine"; pname = "zine";
version = "0.12.1"; version = "0.13.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-54kbSli/cEG8MlbPWC3xauj2VFxru/5haXfHaViUCN8="; sha256 = "sha256-N+0FEZ8TUbMs9cwPmURr39wRA+m7B4UbUOkpNmF1p9A=";
}; };
cargoHash = "sha256-youQoyJURmhPZItvfCSytUBpwRrejRf6EzfvjtgXH5E="; cargoHash = "sha256-2Mc1hrVJ3a1tE/Jo6MYjCfd03889raVTyLBzhCQi8ck=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

6
pkgs/development/tools/the-way/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "the-way"; pname = "the-way";
version = "0.19.1"; version = "0.19.2";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-d4ws5EsYVaxjfDbzoMO3kcJsrk/Htw3Ath3z3UGW7rk="; sha256 = "sha256-jTyKz9ZvA9xJlDQXv2LHrSMeSDbh4AJBxi1WtqUhjgE=";
}; };
cargoSha256 = "sha256-6zphQRhh32iophXSuzbQC5BOuKM92sLS5vXndwF+spg="; cargoSha256 = "sha256-D0H8vChCzBCRjC/S/ceJbuNNAXISiFMZtgu8TMfic+0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

1
pkgs/servers/mautrix-facebook/default.nix
View File

@ -18,6 +18,7 @@ python3.pkgs.buildPythonPackage rec {
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
commonmark
aiohttp aiohttp
asyncpg asyncpg
commonmark commonmark

1
pkgs/servers/mautrix-googlechat/default.nix
View File

@ -52,6 +52,7 @@
yarl yarl
asyncpg asyncpg
ruamel-yaml ruamel-yaml
commonmark
python-magic python-magic
protobuf3 protobuf3
mautrix mautrix

1
pkgs/servers/mautrix-signal/default.nix
View File

@ -26,6 +26,7 @@ python3.pkgs.buildPythonPackage rec {
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
commonmark
aiohttp aiohttp
asyncpg asyncpg
attrs attrs

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

@ -55,7 +55,7 @@ mapAliases ({
class-registry = phx-class-registry; # added 2021-10-05 class-registry = phx-class-registry; # added 2021-10-05
codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02 codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02
ColanderAlchemy = colanderalchemy; # added 2023-02-19 ColanderAlchemy = colanderalchemy; # added 2023-02-19
CommonMark = commonmark; # added 2023-02-19 CommonMark = commonmark; # added 2023-02-1
ConfigArgParse = configargparse; # added 2021-03-18 ConfigArgParse = configargparse; # added 2021-03-18
cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23