tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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

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

Martin Weinelt 4bfe4794 aa407c51

+15 -12
unified split
+2 -2
pkgs/applications/audio/opustags/default.nix
··· 3 4 stdenv.mkDerivation rec { 5 pname = "opustags"; 6 - version = "1.7.0"; 7 8 src = fetchFromGitHub { 9 owner = "fmang"; 10 repo = "opustags"; 11 rev = version; 12 - sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw="; 13 }; 14 15 buildInputs = [ libogg ];
··· 3 4 stdenv.mkDerivation rec { 5 pname = "opustags"; 6 + version = "1.8.0"; 7 8 src = fetchFromGitHub { 9 owner = "fmang"; 10 repo = "opustags"; 11 rev = version; 12 + sha256 = "sha256-qxtTJ4Hl2ccL+rhONeoOfV6ZyJaWaVDPMsXYJkXCWkY="; 13 }; 14 15 buildInputs = [ libogg ];
+3 -3
pkgs/applications/misc/hugo/default.nix
··· 2 3 buildGoModule rec { 4 pname = "hugo"; 5 - version = "0.111.2"; 6 7 src = fetchFromGitHub { 8 owner = "gohugoio"; 9 repo = pname; 10 rev = "v${version}"; 11 - hash = "sha256-UVxE5f+WLIoCEhFh1lbOE8LoXVN/+BzHCpJ61Gqknzc="; 12 }; 13 14 - vendorHash = "sha256-xiysjJi3bL0xIoEEo7xXQbznFzwKJrCT6l/bxEbDRUI="; 15 16 doCheck = false; 17
··· 2 3 buildGoModule rec { 4 pname = "hugo"; 5 + version = "0.111.3"; 6 7 src = fetchFromGitHub { 8 owner = "gohugoio"; 9 repo = pname; 10 rev = "v${version}"; 11 + hash = "sha256-PgconAixlSgRHqmfRdOtcpVJyThZIKAB9Pm4AUvYVGQ="; 12 }; 13 14 + vendorHash = "sha256-2a6+s0xLlj3VzXp9zbZgIi7WJShbUQH48tUG9Slm770="; 15 16 doCheck = false; 17
+3 -3
pkgs/applications/misc/zine/default.nix
··· 10 11 rustPlatform.buildRustPackage rec { 12 pname = "zine"; 13 - version = "0.12.1"; 14 15 src = fetchCrate { 16 inherit pname version; 17 - sha256 = "sha256-54kbSli/cEG8MlbPWC3xauj2VFxru/5haXfHaViUCN8="; 18 }; 19 20 - cargoHash = "sha256-youQoyJURmhPZItvfCSytUBpwRrejRf6EzfvjtgXH5E="; 21 22 nativeBuildInputs = [ 23 pkg-config
··· 10 11 rustPlatform.buildRustPackage rec { 12 pname = "zine"; 13 + version = "0.13.0"; 14 15 src = fetchCrate { 16 inherit pname version; 17 + sha256 = "sha256-N+0FEZ8TUbMs9cwPmURr39wRA+m7B4UbUOkpNmF1p9A="; 18 }; 19 20 + cargoHash = "sha256-2Mc1hrVJ3a1tE/Jo6MYjCfd03889raVTyLBzhCQi8ck="; 21 22 nativeBuildInputs = [ 23 pkg-config
+3 -3
pkgs/development/tools/the-way/default.nix
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "the-way"; 5 - version = "0.19.1"; 6 7 src = fetchCrate { 8 inherit pname version; 9 - sha256 = "sha256-d4ws5EsYVaxjfDbzoMO3kcJsrk/Htw3Ath3z3UGW7rk="; 10 }; 11 12 - cargoSha256 = "sha256-6zphQRhh32iophXSuzbQC5BOuKM92sLS5vXndwF+spg="; 13 14 nativeBuildInputs = [ installShellFiles ]; 15
··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "the-way"; 5 + version = "0.19.2"; 6 7 src = fetchCrate { 8 inherit pname version; 9 + sha256 = "sha256-jTyKz9ZvA9xJlDQXv2LHrSMeSDbh4AJBxi1WtqUhjgE="; 10 }; 11 12 + cargoSha256 = "sha256-D0H8vChCzBCRjC/S/ceJbuNNAXISiFMZtgu8TMfic+0="; 13 14 nativeBuildInputs = [ installShellFiles ]; 15
+1
pkgs/servers/mautrix-facebook/default.nix
··· 18 }; 19 20 propagatedBuildInputs = with python3.pkgs; [ 21 aiohttp 22 asyncpg 23 commonmark
··· 18 }; 19 20 propagatedBuildInputs = with python3.pkgs; [ 21 + commonmark 22 aiohttp 23 asyncpg 24 commonmark
+1
pkgs/servers/mautrix-googlechat/default.nix
··· 52 yarl 53 asyncpg 54 ruamel-yaml 55 python-magic 56 protobuf3 57 mautrix
··· 52 yarl 53 asyncpg 54 ruamel-yaml 55 + commonmark 56 python-magic 57 protobuf3 58 mautrix
+1
pkgs/servers/mautrix-signal/default.nix
··· 26 ]; 27 28 propagatedBuildInputs = with python3.pkgs; [ 29 aiohttp 30 asyncpg 31 attrs
··· 26 ]; 27 28 propagatedBuildInputs = with python3.pkgs; [ 29 + commonmark 30 aiohttp 31 asyncpg 32 attrs
+1 -1
pkgs/top-level/python-aliases.nix
··· 55 class-registry = phx-class-registry; # added 2021-10-05 56 codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02 57 ColanderAlchemy = colanderalchemy; # added 2023-02-19 58 - CommonMark = commonmark; # added 2023-02-19 59 ConfigArgParse = configargparse; # added 2021-03-18 60 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 61 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
··· 55 class-registry = phx-class-registry; # added 2021-10-05 56 codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02 57 ColanderAlchemy = colanderalchemy; # added 2023-02-19 58 + CommonMark = commonmark; # added 2023-02-1 59 ConfigArgParse = configargparse; # added 2021-03-18 60 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 61 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23