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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-27 00:02:24 +00:00 committed by GitHub
commit f80bca6721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 166 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/glow/default.nix
View File

@ -1,6 +1,8 @@
{ lib { lib
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, installShellFiles
, stdenv
}: }:
buildGoModule rec { buildGoModule rec {
pname = "glow"; pname = "glow";
@ -19,6 +21,14 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd glow \
--bash <($out/bin/glow completion bash) \
--fish <($out/bin/glow completion fish) \
--zsh <($out/bin/glow completion zsh)
'';
meta = with lib; { meta = with lib; {
description = "Render markdown on the CLI, with pizzazz!"; description = "Render markdown on the CLI, with pizzazz!";
homepage = "https://github.com/charmbracelet/glow"; homepage = "https://github.com/charmbracelet/glow";

4
pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "helm-secrets"; pname = "helm-secrets";
version = "4.4.2"; version = "4.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jkroepke"; owner = "jkroepke";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GpPgjRqzH4fcnaHs9SWfdaCZimwBleXnxQLjqy8SArs="; hash = "sha256-zytorArHhdwF7F9c2QkaX3KxLNlWySKieK2K1b5omFI=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

1
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
View File

@ -43,6 +43,5 @@ in
meta = metaCommon // { meta = metaCommon // {
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
mainProgram = "caprine";
}; };
}) })

1
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix
View File

@ -30,6 +30,5 @@ stdenvNoCC.mkDerivation {
meta = metaCommon // { meta = metaCommon // {
platforms = with lib.platforms; darwin; platforms = with lib.platforms; darwin;
mainProgram = "caprine";
}; };
} }

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20230925"; version = "20230926";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-j1iAFNG6A/u/2OY07At0kobXtlSqoy3jM2rBf96qhHQ="; hash = "sha256-OU5jKalS8vbQPMT+/FgXbRjWrgL96oIp2I/eHsRa7Q8=";
}; };
postPatch = '' postPatch = ''

14
pkgs/applications/networking/soju/default.nix
View File

@ -18,13 +18,6 @@ buildGoModule rec {
vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4="; vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4=";
subPackages = [
"cmd/soju"
"cmd/sojuctl"
"contrib/migrate-db"
"contrib/znc-import"
];
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
scdoc scdoc
@ -33,17 +26,14 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];
postBuild = '' postBuild = ''
make doc/soju.1 make doc/soju.1 doc/sojuctl.1
''; '';
postInstall = '' postInstall = ''
installManPage doc/soju.1 installManPage doc/soju.1 doc/sojuctl.1
''; '';
preCheck = '' preCheck = ''
# Test all targets.
unset subPackages
# Disable a test that requires an additional service. # Disable a test that requires an additional service.
rm database/postgres_test.go rm database/postgres_test.go
''; '';

6
pkgs/applications/version-management/git-mit/default.nix
View File

@ -10,7 +10,7 @@
}: }:
let let
version = "5.12.147"; version = "5.12.149";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "git-mit"; pname = "git-mit";
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "PurpleBooth"; owner = "PurpleBooth";
repo = "git-mit"; repo = "git-mit";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-TaYuxyezegPZPWlkYcZk+YhmHqQ/P1nO5D5JC3LN8bo="; hash = "sha256-8e7tuNXgYT4wkTbxEz+Sqp0zVody0QC+yK8gcjR3Pww=";
}; };
cargoHash = "sha256-9oqw2rIAhdo5G2GsW7rwHMymgFASKE7OrVqO2ewfG2g="; cargoHash = "sha256-V5c/UsNFWogCgyHSDwsOm2Nfsl/vBUClKQGmwzYqNz0=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

6
pkgs/applications/version-management/gql/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gql"; pname = "gql";
version = "0.7.0"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AmrDeveloper"; owner = "AmrDeveloper";
repo = "GQL"; repo = "GQL";
rev = version; rev = version;
hash = "sha256-iM5a0uy+egPBMSDBo6ks8QNfRoKku2GmFpzoanSDm9M="; hash = "sha256-qNLVbhVXITbMRI2x/0q5enJgjL3EAcXBwqWeH6MPfZs=";
}; };
cargoHash = "sha256-bpPrnguDSj1K22vmf/hEimd4tVS6ANmTiVtdsUuN1BM="; cargoHash = "sha256-UrzJGEASGaDqKUrPiNcjldevCqCPaNXJXNYecbHodOc=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

36
pkgs/by-name/ca/cargo-bump/package.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-bump";
version = "1.1.1";
src = fetchFromGitHub {
owner = "rustadopt";
repo = "cargo-bump";
rev = "v${version}";
hash = "sha256-PhA7uC2gJcBnUQPWgZC51p/KTSxSGld3m+dd6BhW6q8=";
};
cargoHash = "sha256-mp2y5q0GYfSlB5aPC6MY9Go8a2JAiPKtVYL9SewfloI=";
nativeBuildInputs = [
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "Increments the version number of the current project.";
homepage = "https://github.com/wraithan/cargo-bump";
license = with licenses; [ isc ];
maintainers = with maintainers; [ cafkafk ];
};
}

6
pkgs/development/interpreters/cel-go/default.nix
View File

@ -5,18 +5,18 @@
buildGoModule rec { buildGoModule rec {
pname = "cel-go"; pname = "cel-go";
version = "0.18.0"; version = "0.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "cel-go"; repo = "cel-go";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-+YGRcTlPKTdecMicW4UjupSnuuq5msfGKTP/bwOf7dw="; hash = "sha256-eXltZkg5QjdCrL9sk2ngVtirSnjBBqk+OdNLY4QtVx4=";
}; };
modRoot = "repl"; modRoot = "repl";
vendorHash = "sha256-RSCZOR++WBoGffCQp114Sa1Dbms2tBa0xceVQ3skwR4="; vendorHash = "sha256-kalTHpyMYrKZHayxNKLc8vtogiDKyyQLExOQhqp1MUY=";
patches = [ patches = [
# repl/go.mod and repl/go.sum are outdated # repl/go.mod and repl/go.sum are outdated

14
pkgs/development/libraries/pe-parse/default.nix
View File

@ -1,23 +1,16 @@
{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }: { lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pe-parse"; pname = "pe-parse";
version = "2.0.0"; version = "2.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trailofbits"; owner = "trailofbits";
repo = "pe-parse"; repo = "pe-parse";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k="; hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M=";
}; };
patches = [
(fetchpatch {
url = "https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c.patch";
hash = "sha256-pd6D/JMctiQqJxnJU9Nm/GDVf4/CaIGeXx1UfdcCupo=";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
doInstallCheck = true; doInstallCheck = true;
@ -28,6 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A principled, lightweight parser for Windows portable executable files"; description = "A principled, lightweight parser for Windows portable executable files";
homepage = "https://github.com/trailofbits/pe-parse"; homepage = "https://github.com/trailofbits/pe-parse";
changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ arturcygan ]; maintainers = with maintainers; [ arturcygan ];
mainProgram = "dump-pe"; mainProgram = "dump-pe";

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

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "clarifai-grpc"; pname = "clarifai-grpc";
version = "9.8.0"; version = "9.8.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-hUx+dUx0Lkz6sEZizHqH8ONk2r19D9MIVuefhBmjEiQ="; hash = "sha256-j+dtcNInkTcgcLt6IOjqVeI/qSczRNs9PhS9iPoUF+c=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-language/default.nix
View File

@ -40,8 +40,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Google Cloud Natural Language API client library"; description = "Google Cloud Natural Language API client library";
homepage = "https://github.com/googleapis/python-language"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-language";
changelog = "https://github.com/googleapis/python-language/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v${version}/packages/google-cloud-language/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

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

@ -21,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupytext"; pname = "jupytext";
version = "1.15.1"; version = "1.15.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "mwouts"; owner = "mwouts";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-XGjAPeMtg2Epu85JiqQPyZJVez5Z8uA+E40SFcZM7WY="; hash = "sha256-GvMoz2BsYWk0atrT3xmSnbV7AuO5RJoM/bOJlZ5YIn4=";
}; };
# Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch # Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch

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

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyorthanc"; pname = "pyorthanc";
version = "1.11.5"; version = "1.12.2";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
format = "pyproject"; format = "pyproject";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gacou54"; owner = "gacou54";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-RZJ7BuQRJ+yaHFv9iq4uFvMtH8NvGvmpjmgmyvw9rGk="; hash = "sha256-kgCHPp0nsbhzNw/bKwDeDc1mMcmdJUBmZExTZ01nlZY=";
}; };
nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ];

4
pkgs/development/tools/fx/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "fx"; pname = "fx";
version = "30.1.0"; version = "30.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "antonmedv"; owner = "antonmedv";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-SqD3NPaeJB/bxb47PO39mwJGnSg2WBQ3RyA6PRn7z10="; hash = "sha256-uKHh7ERxcIXmKY2NHichuyEIDu0MkeTs1f0jqark//E=";
}; };
vendorHash = "sha256-6wVcdzTYnB0Bd/YLPcbryKxCXu5genzQQ96znbn2ahw="; vendorHash = "sha256-6wVcdzTYnB0Bd/YLPcbryKxCXu5genzQQ96znbn2ahw=";

6
pkgs/development/tools/rust/cargo-binstall/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-binstall"; pname = "cargo-binstall";
version = "1.3.1"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cargo-bins"; owner = "cargo-bins";
repo = "cargo-binstall"; repo = "cargo-binstall";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-BuJpxsB7tF/MSF8g17cHOyHIwbd2JmlQYe1uG9qJGt8="; hash = "sha256-viy7C9ZMUJoAdIwOBvogkiTApTrD3X9cEOqPtfksjOA=";
}; };
cargoHash = "sha256-H+svFw/JEYB8fbmX/5WWGb7qQnm1WBNCuqgJZYDWD00="; cargoHash = "sha256-hH2P2hpQji4n7LidNionkEYHcDpU4qP23ScQLsy92Nw=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

8
pkgs/development/tools/rust/cargo-llvm-cov/default.nix
View File

@ -25,7 +25,7 @@
let let
pname = "cargo-llvm-cov"; pname = "cargo-llvm-cov";
version = "0.5.32"; version = "0.5.33";
owner = "taiki-e"; owner = "taiki-e";
homepage = "https://github.com/${owner}/${pname}"; homepage = "https://github.com/${owner}/${pname}";
@ -36,7 +36,7 @@ let
cargoLock = fetchurl { cargoLock = fetchurl {
name = "Cargo.lock"; name = "Cargo.lock";
url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download";
sha256 = "sha256-8waZZyEvdPBJo722/FOQtarJdWR3FPZv9Cw2Pf/waqs="; sha256 = "sha256-FDr1Yx2k9yTqnQbtkT8h8DErPe54/lswfbzZKM0Knpk=";
downloadToTemp = true; downloadToTemp = true;
postFetch = '' postFetch = ''
tar xzf $downloadedFile ${pname}-${version}/Cargo.lock tar xzf $downloadedFile ${pname}-${version}/Cargo.lock
@ -54,7 +54,7 @@ rustPlatform.buildRustPackage {
inherit owner; inherit owner;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-aG6XNIgSTdce62gQMG3pNIKtP+jQUmVx+7NdHOkvmlQ="; sha256 = "sha256-nlrQIzQc63XdUqWiHFXqjwzzNhgpEba7Rw4VE1d0yBU=";
}; };
# Upstream doesn't include the lockfile so we need to add it back # Upstream doesn't include the lockfile so we need to add it back
@ -62,7 +62,7 @@ rustPlatform.buildRustPackage {
cp ${cargoLock} source/Cargo.lock cp ${cargoLock} source/Cargo.lock
''; '';
cargoSha256 = "sha256-jUrjGH1c4i+lOv5wHiNQwZifZh7uTVuu2NCSGtK0ohc="; cargoSha256 = "sha256-etMpCnbdSzaZnlzGlVnTL84VxInYFpuA4xrt8qNqbsQ=";
# `cargo-llvm-cov` reads these environment variables to find these binaries, # `cargo-llvm-cov` reads these environment variables to find these binaries,
# which are needed to run the tests # which are needed to run the tests

6
pkgs/development/tools/rust/cargo-modules/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-modules"; pname = "cargo-modules";
version = "0.9.2"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "regexident"; owner = "regexident";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-3yvrIUvAlnAjEMnBTgDTY8gRW7rILu2Yns/A7lse2Qw="; hash = "sha256-GbBPIJh2TnIpzpuSLZlrxEVN5hWFakeERKNeTcYbjSY=";
}; };
cargoHash = "sha256-Coh+gg2s4esdByQG6iNlG/VqftP+Gg0qaPoPArim1yQ="; cargoHash = "sha256-g8Edt2rmOSfoJ3UsZIUyTOIxXgf6iQD+TueK89d18CQ=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.CoreServices

6
pkgs/development/tools/rust/duckscript/default.nix
View File

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "duckscript_cli"; pname = "duckscript_cli";
version = "0.8.20"; version = "0.9.1";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-o9GKcRBtQn0m8pQHlokACGVBArd4khtoJ6e4Q2hcT14="; hash = "sha256-jpAZpx8VooYapSLApWWMLTj7c3wqw/S1w1zHN3OGzMs=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoHash = "sha256-dG7bBg/pRcSWWV0NK8gWbXAmsNipHQKUwmTHHFdUsrc="; cargoHash = "sha256-n40V75yIuSC1abq4/cYFqj9JqGj/uJ36ZSz8APovE6o=";
meta = with lib; { meta = with lib; {
description = "Simple, extendable and embeddable scripting language."; description = "Simple, extendable and embeddable scripting language.";

6
pkgs/development/tools/rust/rust-script/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-script"; pname = "rust-script";
version = "0.31.0"; version = "0.32.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fornwall"; owner = "fornwall";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-W0+UaP0aROfGuvWhPcq6QYJZ6XgUAp4XARTzr3Pch/o="; sha256 = "sha256-VyiVa1aeJslH1Vkg0TvON7VDiJVMIIbrlmx2FRDz75o=";
}; };
cargoSha256 = "sha256-dNtAee7lyrlamZEtkrrGgs25xW74UixI4NdeD35wzJU="; cargoSha256 = "sha256-K7wT5Og1nx+UcsehLbpUx0NlvoaicMDd02SkUoAncwI=";
# tests require network access # tests require network access
doCheck = false; doCheck = false;

6
pkgs/development/tools/sq/default.nix
View File

@ -2,16 +2,16 @@
buildGo121Module rec { buildGo121Module rec {
pname = "sq"; pname = "sq";
version = "0.42.0"; version = "0.42.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neilotoole"; owner = "neilotoole";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-IL3041R35WL+sYCpTjfPXUpd7GTcQoaILYBufwH1WoE="; hash = "sha256-3Hu0vMulGWyNWgNlekYuTRxxxBbRkWj2RE0MWZzNXFk=";
}; };
vendorHash = "sha256-ez5qhGgK0q3oDT0L0Fs+JKJjMbNoJukzCoir2a9ro48="; vendorHash = "sha256-qEwK40BcUetsQOIefdjM/dgjTNuHO1EZgVk53/dfOlc=";
proxyVendor = true; proxyVendor = true;

6
pkgs/development/tools/typos/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "typos"; pname = "typos";
version = "1.16.13"; version = "1.16.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crate-ci"; owner = "crate-ci";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ldmbPxQUEXQ8T1Gy2xIl8uCMMD/sat23esOSnnf3SWs="; hash = "sha256-GFr5YpXWSQLvsX2FWLwK5MuIXAhWJ1DjEqvqM3lGEMY=";
}; };
cargoHash = "sha256-7o3xiaxuFanEplSADCRy4tFsACKNFlsNrJfNJ9HBJFg="; cargoHash = "sha256-M+WM8MxCbW1gh4IMyAsIP+Jtyuu35AUedF0TCzk67Fg=";
meta = with lib; { meta = with lib; {
description = "Source code spell checker"; description = "Source code spell checker";

24
pkgs/games/factorio/versions.json
View File

@ -2,12 +2,12 @@
"x86_64-linux": { "x86_64-linux": {
"alpha": { "alpha": {
"experimental": { "experimental": {
"name": "factorio_alpha_x64-1.1.91.tar.xz", "name": "factorio_alpha_x64-1.1.92.tar.xz",
"needsAuth": true, "needsAuth": true,
"sha256": "0dcanryqmikhllp8lwhdapbm9scrgfgnvgwdf18wn8asr652vz39", "sha256": "1arirh9180bmix2dglqlgcm036mbjanc4sxx0kc92j2grpw7xf53",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.91/alpha/linux64", "url": "https://factorio.com/get-download/1.1.92/alpha/linux64",
"version": "1.1.91" "version": "1.1.92"
}, },
"stable": { "stable": {
"name": "factorio_alpha_x64-1.1.91.tar.xz", "name": "factorio_alpha_x64-1.1.91.tar.xz",
@ -20,12 +20,12 @@
}, },
"demo": { "demo": {
"experimental": { "experimental": {
"name": "factorio_demo_x64-1.1.91.tar.xz", "name": "factorio_demo_x64-1.1.92.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "1j9nzc3rs9q43vh9i0jgpyhgnjjif98sdgk4r47m0qrxjb4pnfx0", "sha256": "02mqj2hlpsd0kgg0rav4k70pqh2sk4g2879c2nhp61ms79kdizh4",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.91/demo/linux64", "url": "https://factorio.com/get-download/1.1.92/demo/linux64",
"version": "1.1.91" "version": "1.1.92"
}, },
"stable": { "stable": {
"name": "factorio_demo_x64-1.1.91.tar.xz", "name": "factorio_demo_x64-1.1.91.tar.xz",
@ -38,12 +38,12 @@
}, },
"headless": { "headless": {
"experimental": { "experimental": {
"name": "factorio_headless_x64-1.1.91.tar.xz", "name": "factorio_headless_x64-1.1.92.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "0v8zg3q79n15242fr79f9amg0icw3giy4aiaf43am5hxzcdb5212", "sha256": "04j3p2r1r0h3fak3vxxq3d7qqpyjlg57n3c8sm6gadg4q4h15aw8",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.91/headless/linux64", "url": "https://factorio.com/get-download/1.1.92/headless/linux64",
"version": "1.1.91" "version": "1.1.92"
}, },
"stable": { "stable": {
"name": "factorio_headless_x64-1.1.91.tar.xz", "name": "factorio_headless_x64-1.1.91.tar.xz",

10
pkgs/servers/matrix-synapse/default.nix
View File

@ -16,20 +16,20 @@ let
in in
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.92.1"; version = "1.93.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matrix-org"; owner = "matrix-org";
repo = "synapse"; repo = "synapse";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-rCxoYtdvh+Gu0O2T3uu0k2FFFFc7m09LuKJvkSky3M4="; hash = "sha256-fmY5xjpbFwzrX47ijPxOUTI0w9stYVPpSV+HRF4GdlA=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-yZeCENWdPv80Na1++/IQFOrhah/VHWwJDNV2dI/yTHg="; hash = "sha256-9cCEfDV5X65JublgkUP6NVfMIObPawx+nXTmIG9lg5o=";
}; };
postPatch = '' postPatch = ''
@ -41,6 +41,10 @@ python3.pkgs.buildPythonApplication rec {
# be extra defensive, but we don't want to deal with updating this # be extra defensive, but we don't want to deal with updating this
sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml
sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml
# Don't force pillow to be 10.0.1 because we already have patched it, and
# we don't use the pillow wheels.
sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml
''; '';
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [

4
pkgs/servers/snac2/default.nix
View File

@ -10,14 +10,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snac2"; pname = "snac2";
version = "2.35"; version = "2.41";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "grunfink"; owner = "grunfink";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-V9Q9rjinFDFCi2snQ27R0Y9KFrYD/HLElnT8KV/3bP4="; hash = "sha256-WVbGORth3paDo1eK/J7MPUstVQifcU7ksVEb87vknN0=";
}; };
buildInputs = [ curl openssl ]; buildInputs = [ curl openssl ];

4
pkgs/tools/X11/wpgtk/default.nix
View File

@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "wpgtk"; pname = "wpgtk";
version = "6.5.7"; version = "6.5.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deviantfero"; owner = "deviantfero";
repo = "wpgtk"; repo = "wpgtk";
rev = version; rev = version;
sha256 = "sha256-rHNni0nDghc5kI1sWHAb5ODr4buBz65eUEB1qWpbTTs="; sha256 = "sha256-NlJG9d078TW1jcnVrpBORIIwDUGIAGWZoDbXp9/qRr4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/nix/nixos-generators/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nixos-generators"; pname = "nixos-generators";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "nixos-generators"; repo = "nixos-generators";
rev = version; rev = version;
sha256 = "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ="; sha256 = "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=";
}; };
strictDeps = true; strictDeps = true;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

6
pkgs/tools/security/keybase/default.nix
View File

@ -5,7 +5,7 @@
buildGoModule rec { buildGoModule rec {
pname = "keybase"; pname = "keybase";
version = "6.0.2"; version = "6.2.2";
modRoot = "go"; modRoot = "go";
subPackages = [ "kbnm" "keybase" ]; subPackages = [ "kbnm" "keybase" ];
@ -16,9 +16,9 @@ buildGoModule rec {
owner = "keybase"; owner = "keybase";
repo = "client"; repo = "client";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-JiYufEsoj/98An2qKdm/Uu4YHJr6ttc/VHn4kMgkuwI="; hash = "sha256-1vJCuAkJmehFcVYLwp3UIlQiGji7mHVczCBtXq9Fl68=";
}; };
vendorHash = "sha256-D8b/pvmBGCnaRuf92FYgRcSSbN59Yu0CHKxAybdYjS4="; vendorHash = "sha256-tXEEVEfjoKub2A4m7F3hDc5ABJ+R+axwX1+1j7e3BAM=";
patches = [ patches = [
(substituteAll { (substituteAll {

6
pkgs/tools/security/keybase/gui.nix
View File

@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }: , runtimeShell, gsettings-desktop-schemas }:
let let
versionSuffix = "20220610191041.a459abf326"; versionSuffix = "20230726175256.4464bfb32d";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keybase-gui"; pname = "keybase-gui";
version = "6.0.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages version = "6.2.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl { src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
hash = "sha256-FMhbMSuJHq5d5E0dTVAk02y85UXmhtKZYk4qcbnhRxI="; hash = "sha256-X3BJksdddTdxeUqVjzcq3cDRGRqmaYE7Z+eXtHoqbkg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

15
pkgs/tools/text/mecab/base.nix
View File

@ -1,16 +1,17 @@
{ fetchurl }: { fetchurl }:
{ finalAttrs: {
version = "0.996"; version = "0.996";
src = fetchurl { src = fetchurl {
url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE"; url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE";
name = "mecab-0.996.tar.gz"; name = "mecab-${finalAttrs.version}.tar.gz";
sha256 = "0ncwlqxl1hdn1x4v4kr2sn1sbbcgnhdphp0lcvk74nqkhdbk4wz0"; hash = "sha256-4HMyV4MTW3LmZhRceBu0j62lg9UiT7JJD7bBQDumnFk=";
}; };
buildPhase = '' configureFlags = [
make "--with-charset=utf8"
make check ];
'';
doCheck = true;
} }

10
pkgs/tools/text/mecab/default.nix
View File

@ -3,9 +3,8 @@
let let
mecab-base = import ./base.nix { inherit fetchurl; }; mecab-base = import ./base.nix { inherit fetchurl; };
in in
stdenv.mkDerivation (mecab-base // { stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // {
pname = "mecab"; pname = "mecab";
version = mecab-base.version;
postInstall = '' postInstall = ''
sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc"
@ -13,9 +12,10 @@ stdenv.mkDerivation (mecab-base // {
meta = with lib; { meta = with lib; {
description = "Japanese morphological analysis system"; description = "Japanese morphological analysis system";
homepage = "http://taku910.github.io/mecab/"; homepage = "http://taku910.github.io/mecab";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ auntie ]; mainProgram = "mecab";
maintainers = with maintainers; [ auntie paveloom ];
}; };
}) }))

15
pkgs/tools/text/mecab/ipadic.nix
View File

@ -1,18 +1,19 @@
{ stdenv, fetchurl, mecab-nodic }: { stdenv, fetchurl, mecab-nodic }:
stdenv.mkDerivation { stdenv.mkDerivation (finalAttrs: {
pname = "mecab-ipadic"; pname = "mecab-ipadic";
version = "2.7.0-20070801"; version = "2.7.0-20070801";
src = fetchurl { src = fetchurl {
url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM"; url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM";
name = "mecab-ipadic-2.7.0-20070801.tar.gz"; name = "mecab-ipadic-${finalAttrs.version}.tar.gz";
sha256 = "08rmkvj0f0x6jq0axrjw2y5nam0mavv6x77dp9v4al0wi1ym4bxn"; hash = "sha256-ti9SfYgcUEV2uu2cbvZWFVRlixdc5q4AlqYDB+SeNSM=";
}; };
buildInputs = [ mecab-nodic ]; buildInputs = [ mecab-nodic ];
configurePhase = '' configureFlags = [
./configure --with-dicdir="$out" "--with-charset=utf8"
''; "--with-dicdir=${placeholder "out"}"
} ];
})

5
pkgs/tools/text/mecab/nodic.nix
View File

@ -3,7 +3,6 @@
let let
mecab-base = import ./base.nix { inherit fetchurl; }; mecab-base = import ./base.nix { inherit fetchurl; };
in in
stdenv.mkDerivation (mecab-base // { stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // {
pname = "mecab-nodic"; pname = "mecab-nodic";
version = mecab-base.version; }))
})

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

@ -25198,7 +25198,7 @@ with pkgs;
snappy = callPackage ../development/libraries/snappy { }; snappy = callPackage ../development/libraries/snappy { };
snac2 = callPackage ../servers/snac2 { }; snac2 = darwin.apple_sdk_11_0.callPackage ../servers/snac2 { };
snappymail = callPackage ../servers/snappymail { }; snappymail = callPackage ../servers/snappymail { };