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] 2022-09-23 00:02:56 +00:00 committed by GitHub
commit bdf7bb0f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 193 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/librewolf/src.json
View File

@ -1,11 +1,11 @@
{
"packageVersion": "104.0-1",
"packageVersion": "105.0-1",
"source": {
"rev": "104.0-1",
"sha256": "0fvbpiaabcr1j39zc3xz1czah537s8abidwch5a75phxn676np2k"
"rev": "105.0-1",
"sha256": "0p3bcyyap8yjxha064klpjkhca6hdis3qgx15c4dh8wc3gr581f6"
},
"firefox": {
"version": "104.0",
"sha512": "8778650ffa3c2d18802c348e27789f00cff143c7ca0ae01b1bcd050b6942c149db25696b48f3c702fbde901c15fcae976ac731a456f641637cae3eb56d0077d3"
"version": "105.0",
"sha512": "a48f323f874b538402630a9094daa83189b3ca319feddc80fd66d087eca13f21c8b2d85be9c29e948c18cb7c524adac44e135adcde4d4592738e104ae9c1a734"
}
}

1
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -429,7 +429,6 @@ stdenv.mkDerivation rec {
platforms = attrNames srcs;
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ];
mainProgram = "tor-browser";
hydraPlatforms = [];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.

4
pkgs/applications/networking/cluster/cilium/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.12.3";
version = "0.12.4";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mgyzdu7xzN6rDSHBcC8Uz8m5+5VEfA0RPe8cPZYfEgM=";
sha256 = "sha256-AmJHc9+d053tzz1nj5yyJYDxV3/Bko3plkfR2RjbjH8=";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -21,13 +21,13 @@
buildGoModule rec {
pname = "kubernetes";
version = "1.23.11";
version = "1.23.12";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "sha256-fjB5O3kuU09megWGgU7f3otmWD/a31xVV1Dap2+xFkw=";
sha256 = "sha256-PuSjMyve7YxxuVr3ztM6nM86gl3GpcIa+LHajzfXODU=";
};
vendorSha256 = null;

4
pkgs/applications/radio/sdrangel/default.nix
View File

@ -42,13 +42,13 @@
mkDerivation rec {
pname = "sdrangel";
version = "7.6.3";
version = "7.7.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
sha256 = "sha256-4o91vZnW5+wAKw4o3RrsS4gGVG0TyQCBcKg4GuE3n5s=";
sha256 = "sha256-du5mNGMrXt6iFjb/QXQsW1DpGfIlVjqrbmsQZb4mMZQ=";
fetchSubmodules = false;
};

6
pkgs/development/interpreters/evcxr/default.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "evcxr";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "google";
repo = "evcxr";
rev = "v${version}";
sha256 = "sha256-n9wDO4HIWLINbqGVxaZyAEFVDLLnSpQLKlFf20jLq6o=";
sha256 = "sha256-gB56fGjL/YtzQI+vr83URPhQ6qXrCn5IRPnIYBt8iHk=";
};
cargoSha256 = "sha256-zdIJb9fXRByyAJ32RL9lQh6oS1K78IlZfWdJyj+MMZM=";
cargoSha256 = "sha256-DAbg5G1oGnfBR1kIUt7ebYEx06b6sbexqLyFJ7zKhlk=";
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.29.0";
version = "3.30.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-D3uME31aWBTwjDIcdt3ueOBqlkCeTvpl4ReHLNSHaCw=";
hash = "sha256-jf7tVwv+XvaZcOKNKODRyu4JzLidBRXFd68HD5yi7b0=";
};
nativeBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "motionblinds";
version = "0.6.12";
version = "0.6.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "motion-blinds";
rev = "refs/tags/${version}";
sha256 = "sha256-QVGOVb/YbpCcPIfJbhjBXOi1c72yMwghFpFeWCy3S48=";
sha256 = "sha256-vms9GcB2GQ7fZDk9f9xvFJ5Df7ArEcKn6frIuL1GwPo=";
};
propagatedBuildInputs = [

3
pkgs/development/python-modules/phonenumbers/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
@ -9,6 +10,8 @@ buildPythonPackage rec {
version = "8.12.55";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-G+PHNT6TJd3qqQmrF5NkI8YpWNVwDWjl2lvpUDxG0Ic=";

16
pkgs/development/python-modules/pyatome/default.nix
View File

@ -4,21 +4,29 @@
, requests
, simplejson
, fake-useragent
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyatome";
version = "0.1.1";
version = "0.1.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyAtome";
inherit version;
sha256 = "7282e7ec258c69d4ddf2a5754ff07680a1ac92f9bfb478d601fd9e944fccd834";
hash = "sha256-DGkgW6emh/esZa/alUjBbpLXlU4EVIPkysn9a0LgcJ4=";
};
propagatedBuildInputs = [ requests simplejson fake-useragent ];
propagatedBuildInputs = [
requests
simplejson
fake-useragent
];
# no tests in PyPI tarballs
# No tests in PyPI tarballs
doCheck = false;
pythonImportsCheck = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pylitterbot";
version = "2022.9.5";
version = "2022.9.6";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "natekspencer";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-sTHMu2HNO0VA86bym0lt810aJ9yYN9PYHcw18Qu7e7c=";
hash = "sha256-+8vsnSEEZ7uypASsJZ2MIK+riIF01Lxa1E3t0pC+e/I=";
};
nativeBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pylutron-caseta";
version = "0.14.0";
version = "0.15.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gurumitts";
repo = pname;
rev = "v${version}";
hash = "sha256-D1P4roUZ+byU031RtdwIOR/ncxY9wl9UqCKVb/XPGVk=";
hash = "sha256-dw/uCEY4+kpgNjbjgvw+kSfluziIK6NvIKo5QIjt+GQ=";
};
nativeBuildInputs = [

10
pkgs/development/python-modules/pytomorrowio/default.nix
View File

@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pytomorrowio";
version = "0.3.4";
version = "0.3.5";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-d4twa9bHaQ9XTHSb8pwJnnJ7tDH6vGpck3/8Y39tRaY=";
hash = "sha256-LFIQJJPqKlqLzEoX9ShfoASigPC5R+OWiW81VmjONe8=";
};
propagatedBuildInputs = [
@ -29,7 +29,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "pytomorrowio" ];
pythonImportsCheck = [
"pytomorrowio"
];
meta = {
description = "Async Python package to access the Tomorrow.io API";

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "sabyenc3";
version = "5.4.3";
version = "5.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ei/SnVg4Oy6cBBPxg14lMMQBgbNR4Fg0aa+8sVBTY0Y=";
hash = "sha256-89ZfKnC8sT7xvq4P9rs7aa2uGElwNfjNT/5OWvGqL0E=";
};
# Tests are not included in pypi distribution

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "safety";
version = "2.1.1";
version = "2.2.0";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-28Xf+i5H2nbMQ9/oy7v8qZ0pEY0MbFTfz6EcK9NJ3/Y=";
hash = "sha256-Z0XeEqy9YKWAAf5my1QDVRh9e5kbMBBNnvFP9OSCYHM=";
};
postPatch = ''

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "scmrepo";
version = "0.0.25";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-269vJNclTBWEqM9AJbF96R1I6Ru3q8YBd5A8Rmw7Jjo=";
hash = "sha256-lFeYo7OVT0az+mYgERcVuuT9rX29+E2+WwfdDlMRm+I=";
};
postPatch = ''

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "7.14.0";
version = "7.14.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-+D2zhWm2//eWJyEpMQIZM/lL4u7o3JQjGwUebbJKjQk=";
hash = "sha256-VKAeM1a1TMXrewJ+j+Outyp7vxh9xovqjJ+GneYa6eg=";
};
propagatedBuildInputs = [

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.10";
version = "2.28.11";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-l9j0CqH/4eWMNybHfWPBgtrqmnLZ8fosr96nVrKhnyw=";
sha256 = "sha256-fugn64zmEbArURfP7F2mRVNltqV19eP/GfZVumA+a04=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "unifi-discovery";
version = "1.1.6";
version = "1.1.7";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-C7kCliNLqzkrOoT1oy3scLl3VNdDXwWEqaO0DlGZWmk=";
hash = "sha256-EQFk3kRY/JL1ZTDdHKzl0KbMUuhZSFc4tYqAYvsNSj0=";
};
nativeBuildInputs = [

6
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl }:
let
version = "15.2.1";
version = "15.4.0";
in
buildGoModule rec {
inherit version;
@ -14,13 +14,13 @@ buildGoModule rec {
"-X ${commonPackagePath}.REVISION=v${version}"
];
vendorSha256 = "sha256-weT4Ed/VNTLovxUu2xCdHDqxY7v/5Wi3WsWlNDWYLLc=";
vendorSha256 = "sha256-S0x1b2ITtqMoqdssoTgnolDC6Tyq3IdkJqxwZ29qCyU=";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-HaFxMNREHTtnbIuQUXCinhd4lhcnkLkacLczeySsfWQ=";
sha256 = "sha256-zItzg5r0V+m68c5aIJLMKsTKgmkgWrQD9t0cx5Lcaho=";
};
patches = [

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "datree";
version = "1.6.29";
version = "1.6.33";
src = fetchFromGitHub {
owner = "datreeio";
repo = "datree";
rev = version;
hash = "sha256-RFm7I9HTI3M0fdGOz4ZXHtQY4Pm86SOz9pcIQLqb7/U=";
hash = "sha256-VuTa1bnwxk8SUvOK3jLEvgJTPf3eABUyBssUYtoAxTs=";
};
vendorSha256 = "sha256-mEtnZO4AZEcnEHuiAWguT8VelD0yLj1rytl6gPkPKBg=";
vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw=";
ldflags = [
"-extldflags '-static'"

20
pkgs/development/tools/faas-cli/default.nix
View File

@ -4,6 +4,9 @@
, fetchFromGitHub
, makeWrapper
, git
, installShellFiles
, testers
, faas-cli
}:
let
faasPlatform = platform:
@ -24,12 +27,10 @@ buildGoModule rec {
sha256 = "sha256-iUS8bhTZc7oy7qy0ydmbVW3BNa/lZ2Q+kYefBKrNRyc=";
};
nativeBuildInputs = [ makeWrapper ];
vendorSha256 = null;
CGO_ENABLED = 0;
vendorSha256 = null;
subPackages = [ "." ];
ldflags = [
@ -39,14 +40,25 @@ buildGoModule rec {
"-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}"
];
nativeBuildInputs = [ makeWrapper installShellFiles ];
postInstall = ''
wrapProgram "$out/bin/faas-cli" \
--prefix PATH : ${lib.makeBinPath [ git ]}
installShellCompletion --cmd metal \
--bash <($out/bin/faas-cli completion --shell bash) \
--zsh <($out/bin/faas-cli completion --shell zsh)
'';
passthru.tests.version = testers.testVersion {
command = "${faas-cli}/bin/faas-cli version --short-version --warn-update=false";
package = faas-cli;
};
meta = with lib; {
homepage = "https://github.com/openfaas/faas-cli";
description = "Official CLI for OpenFaaS ";
homepage = "https://github.com/openfaas/faas-cli";
license = licenses.mit;
maintainers = with maintainers; [ welteki techknowlogick ];
};

1
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
View File

@ -78,6 +78,7 @@
tree-sitter-scala = lib.importJSON ./tree-sitter-scala.json;
tree-sitter-scheme = lib.importJSON ./tree-sitter-scheme.json;
tree-sitter-scss = lib.importJSON ./tree-sitter-scss.json;
tree-sitter-smithy = lib.importJSON ./tree-sitter-smithy.json;
tree-sitter-sparql = lib.importJSON ./tree-sitter-sparql.json;
tree-sitter-sql = lib.importJSON ./tree-sitter-sql.json;
tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;

11
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json Normal file
View File

@ -0,0 +1,11 @@
{
"url": "https://github.com/indoorvivants/tree-sitter-smithy",
"rev": "1cdb3578dfec76f19e566ea4c1e305632e88026a",
"date": "2022-05-21T16:39:36+01:00",
"path": "/nix/store/smvp9nkdg6amfzspfj0inmfvcsjgrsjz-tree-sitter-smithy",
"sha256": "14xaflvz43m1c892jh0bg2yzsj1mrambkvsj6xkx84j141nnf4vm",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

4
pkgs/development/tools/parsing/tree-sitter/update.nix
View File

@ -343,6 +343,10 @@ let
orga = "nickel-lang";
repo = "tree-sitter-nickel";
};
"tree-sitter-smithy" = {
orga = "indoorvivants";
repo = "tree-sitter-smithy";
};
};
allGrammars =

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

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
hash = "sha256-TqRz1Og5wsKsiIESmplnTsGLRboEQ20cViWgXfwEHGQ=";
hash = "sha256-pFQJ2ktn3sMO6DOWlBBe1pJOPytqgqX/EvjGZLnypdY=";
};
cargoSha256 = "sha256-4DVek/R7VABzSJ8vEb6f3Tgf1vVLIKAWj80Il5gWu2g=";
cargoSha256 = "sha256-uTbMiMlCq7qImM5yz1ij0dokJgIMECzdBWst8fwdaoM=";
nativeBuildInputs = [ pkg-config ];

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

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
version = "0.5.18";
version = "0.5.19";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-EtM5nGbsvwWiQGKrakMiToz7Hy6xoE3C6JsD2+JBpaA=";
sha256 = "sha256-uBiqmJueSNDB1wWmWvSGR9qPV5NA8yVnl+GyAea30J4=";
};
cargoSha256 = "sha256-3O9j9I6iMsgQl1nhXfdI5sNnnt71FBidQh+bqjpuPhc=";
cargoSha256 = "sha256-X7p+tBcFvDL9PEeLkl0Ab/BqpJan0wJX9WCRjHek6u0=";
# some necessary files are absent in the crate version
doCheck = false;

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

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2022-09-12";
cargoSha256 = "sha256-mi6Ab3CyOfz1ZYViYbJwJCIew/N+IPt37bkq7x/N7IY=";
version = "2022-09-19";
cargoSha256 = "sha256-GoGnhO1WaDpNrxyOj2xJPirwmsZ2IESDmA7orryupfo=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-1LkSsXzI1JTAmP/GMTz4fTJd8y/tw8R79l96q+h7mu8=";
sha256 = "sha256-aG6JOn3BG/2U1zuusB4bwLnPMXNoAeDSL8MWUCDLvl8=";
};
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

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

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "stylua";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x4/DmFi/6bIQVn8sfSFEOJIv4Zd/3oHKXbrd6yIsSYU=";
sha256 = "sha256-uxJsgTEvrwFfGrGv1VFoYGX9RnlqHBgUU75OlqSOEnc=";
};
cargoSha256 = "sha256-lY18so+uG3yri18zd29B479nl0l1C0F1mw+sPrccRQs=";
cargoSha256 = "sha256-FQgb9EcKEp29hl4n+A4hTdzmoEy8MfwUyt32jy1BxiY=";
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
postPatch = ''

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "toxiproxy";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = "toxiproxy";
rev = "v${version}";
sha256 = "sha256-vFf1yLpAa+yO1PCE+pLTnvvtROtpVxlEgACDNNUWBEM=";
sha256 = "sha256-SL3YHsNeFw8K8lPrzJXAoTkHxS+1sTREfzjawBxdnf0=";
};
vendorSha256 = "sha256-mrRMyIU6zeyAT/fXbBmtMlZzpyeB45FQmYJ4FDwTRTo=";
vendorSha256 = "sha256-CmENxPAdjz0BAyvhLKIaJjSbK/mvRzHGCQOfGIiA3yI=";
excludedPackages = [ "test/e2e" ];

40
pkgs/servers/caddy/default.nix
View File

@ -1,6 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib
, buildGoModule
, fetchFromGitHub
, nixosTests
, caddy
, testers
, installShellFiles
}:
let
version = "2.6.0";
version = "2.6.1";
dist = fetchFromGitHub {
owner = "caddyserver";
repo = "dist";
@ -12,25 +19,46 @@ buildGoModule {
pname = "caddy";
inherit version;
subPackages = [ "cmd/caddy" ];
src = fetchFromGitHub {
owner = "caddyserver";
repo = "caddy";
rev = "v${version}";
sha256 = "sha256-BZGfYpQM5e+/LrGqs1oms/vOp9q4UY/ZyDODEsi/wl8=";
sha256 = "sha256-Z8MiMhXH1er+uYvmDQiamF/jSxHbTMwjo61qbH0ioEo=";
};
vendorSha256 = "sha256-6UTErIPB/z4RfndPSLKFJDFweLB3ax8WxEDA+3G5asI=";
patches = [
./inject_version.diff
];
subPackages = [ "cmd/caddy" ];
ldflags = [
"-s" "-w"
"-X github.com/caddyserver/caddy/v2.ShortVersion=${version}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy"
substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy"
installShellCompletion --cmd metal \
--bash <($out/bin/caddy completion bash) \
--zsh <($out/bin/caddy completion zsh)
'';
passthru.tests = { inherit (nixosTests) caddy; };
passthru.tests = {
inherit (nixosTests) caddy;
version = testers.testVersion {
command = "${caddy}/bin/caddy version";
package = caddy;
};
};
meta = with lib; {
homepage = "https://caddyserver.com";

15
pkgs/servers/caddy/inject_version.diff Normal file
View File

@ -0,0 +1,15 @@
diff --git a/caddy.go b/caddy.go
index 584865bd..082b9b6c 100644
--- a/caddy.go
+++ b/caddy.go
@@ -840,7 +840,10 @@ func InstanceID() (uuid.UUID, error) {
// and https://github.com/golang/go/issues/50603.
//
// This function is experimental and subject to change or removal.
+var ShortVersion = "(devel)"
+
func Version() (simple, full string) {
+ return ShortVersion, ShortVersion
// the currently-recommended way to build Caddy involves
// building it as a dependency so we can extract version
// information from go.mod tooling; once the upstream

6
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.1.5";
version = "9.1.6";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-R5gHd9lLXPV6Ck9mhPfdL41/O9ZN76wjBRDUBLtL2eA=";
sha256 = "sha256-DIcKz5M1KdyCBQByt/Z8Z+LBAtjdg5VkoFYRo0x6vP8=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-P+QkpyGRSuZX/OJo/CgMP9z1Rq7tJbWAZCMOwAuEFhc=";
sha256 = "sha256-ftLEnrHE36uQ/Lj6hNPlAN4KyNm4P5m3c7H8erJnkVs=";
};
vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ=";

1
pkgs/servers/pleroma/default.nix
View File

@ -16,6 +16,7 @@ beamPackages.mixRelease rec {
rev = "v${version}";
sha256 = "sha256-x8j/2Eot/EEHsedgZntB5MPxlYMNDlFyZtmiMdhcS7U=";
};
stripDebug = false;
mixNixDeps = import ./mix.nix {
inherit beamPackages lib;

6
pkgs/tools/admin/scaleway-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.5.6";
version = "2.6.0";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-C7hCTDs6XLLQPUojqCJEkdSeANrW3XwfFJscSefe0OQ=";
sha256 = "sha256-wWyykSNSv6Fp+/f54LhYeArXXzRreHdqso28cM1/fl0=";
};
vendorSha256 = "sha256-NUifjoMP3AmT7RjhkilGmQTMtl5wcuPJL5I32/M27a8=";
vendorSha256 = "sha256-awq4rObflJbKjZ2tJrZZMJklXBDwTjuRE8sS3iZBefk=";
ldflags = [
"-w"

4
pkgs/tools/misc/audible-cli/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "audible-cli";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "mkb79";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-z7oLY+xu+rTHgIWLFQU/TTSQtxChwhfu8nXoI05QqLw=";
sha256 = "sha256-umIPHKPfWKlzEVyRKbBqmul/8n13EnpfYXmSQbQtLq8=";
};
propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ];

6
pkgs/tools/networking/mubeng/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "mubeng";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "kitabisa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-z81/WbqhMJPliT5rrW4UY8gseV7R2UDQIUOjZuUgLTI=";
sha256 = "sha256-BY3X9N7XnBZ6mVX/o+EXruJmi3HYWMeY9enSuJY4jWI=";
};
vendorSha256 = "sha256-CjAFntwpHvUOaaLHDOT9Dctptv5EFW62X8XWT4SvT2A=";
vendorSha256 = "sha256-1JxyP6CrJ4/g7o3eGeN1kRXJU/jNLEB8fW1bjJytQqQ=";
ldflags = [ "-s" "-w" "-X ktbs.dev/mubeng/common.Version=${version}" ];

17
pkgs/tools/networking/tinyproxy/default.nix
View File

@ -1,4 +1,11 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, withDebug ? false }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, perl
, withDebug ? false
}:
stdenv.mkDerivation rec {
pname = "tinyproxy";
@ -11,6 +18,14 @@ stdenv.mkDerivation rec {
owner = "tinyproxy";
};
patches = [
(fetchpatch {
name = "CVE-2022-40468.patch";
url = "https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7.patch";
sha256 = "sha256-P0c4mUK227ld3703ss5MQhi8Vo2QVTCVXhKmc9fcufk=";
})
];
# perl is needed for man page generation.
nativeBuildInputs = [ autoreconfHook perl ];

4
pkgs/tools/security/gitleaks/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.12.0";
version = "8.13.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-g15ySGRX9f3zlmoatfzUomokdXyr33geNZnEQLle9rw=";
sha256 = "sha256-Pdl26PoTcI0LiC3O8EN/vW9LjVfI54TsspRnmhpFaVo=";
};
vendorSha256 = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE=";

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

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "keyscope";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "spectralops";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SLVNzxwZhdK2Fk2Vu5P/j0d8IoUPzlb9e5hnJrZ8Qsk=";
sha256 = "sha256-RKeEumj9HuifEXE8g5G7EsIalGD1vLRawh59s/ykUmg=";
};
cargoSha256 = "sha256-PBSQeLQ7UkWhGlRID+bv2HwzgvoiJ120t/TNKJFUY+M=";
cargoSha256 = "sha256-8lTwczuOgPhzwGcQ2KoqK5Zf3HS3uwsok036l+12Xb0=";
nativeBuildInputs = [ pkg-config ];

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

@ -3307,7 +3307,9 @@ with pkgs;
cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; };
cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { };
cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop {
openssl = openssl_1_1;
};
ckbcomp = callPackage ../tools/X11/ckbcomp { };