nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 20:14:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-12 12:02:07 +00:00 committed by GitHub
commit 2dac3f9f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 438 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/graphics/paraview/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitLab, fetchurl
, boost, cmake, ffmpeg, qtbase, qtx11extras
{ lib, stdenv, fetchFromGitLab, fetchurl
, boost, cmake, ffmpeg, wrapQtAppsHook, qtbase, qtx11extras
, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper
, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL
, ninja, mpi, python3, tbb, libGLU, libGL
, withDocs ? true
}:
@ -26,7 +26,7 @@ let
})
];
in mkDerivation rec {
in stdenv.mkDerivation rec {
pname = "paraview";
inherit version;
@ -68,6 +68,7 @@ in mkDerivation rec {
makeWrapper
ninja
gfortran
wrapQtAppsHook
];
buildInputs = [

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.5.10";
version = "2.6.1";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-5UzDfOPuDM5ADsXFwWa9aDM32I5s/TKg4r7idH/X3AQ=";
sha256 = "sha256-O3JJ75qfs02qxzyW4TwPfYckhxuULRK7n67QVZRyB3I=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-rkgwfSmUmxmCxbS/0r5sU+XJTGZ6NTZ+VIXpBElT0uA=";
vendorHash = "sha256-c4KvsHN+2QXk/+MJgRIm5L6LtRe5juUF8rw84aVot38=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

76
pkgs/applications/networking/n8n/node-packages.nix generated
View File

@ -715,13 +715,13 @@ let
sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==";
};
};
"@lezer/html-1.3.0" = {
"@lezer/html-1.3.1" = {
name = "_at_lezer_slash_html";
packageName = "@lezer/html";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.0.tgz";
sha512 = "jU/ah8DEoiECLTMouU/X/ujIg6k9WQMIOFMaCLebzaXfrguyGaR3DpTgmk0tbljiuIJ7hlmVJPcJcxGzmCd0Mg==";
url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.1.tgz";
sha512 = "mxmArW0psdJ3Vd3bZvCbrFpd7gNJgTjqTLhFZfTPo3jsw0STaQ68EWVWBQInv9W8j94XKaL2sbO3qixicFMnYw==";
};
};
"@lezer/javascript-1.4.1" = {
@ -1966,13 +1966,13 @@ let
sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ==";
};
};
"aws-sdk-2.1312.0" = {
"aws-sdk-2.1313.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1312.0";
version = "2.1313.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1312.0.tgz";
sha512 = "NG6ERxxxU6p+CDWrq7wLinp0siKRcCNN98iY0qr/2WKZbz5JCtDyiQV/l+6jLmNKP5qIT5z++jnDy9cgNP6ICQ==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1313.0.tgz";
sha512 = "8GMdtV2Uch3HL2c6+P3lNZFTcg/fqq9L3EWYRLb6ljCZvWKTssjdkjSJFDyTReNgeiKV224YRPYQbKpOEz4flQ==";
};
};
"aws-sign2-0.7.0" = {
@ -5251,13 +5251,13 @@ let
sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==";
};
};
"ioredis-5.3.0" = {
"ioredis-5.3.1" = {
name = "ioredis";
packageName = "ioredis";
version = "5.3.0";
version = "5.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz";
sha512 = "Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw==";
url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.1.tgz";
sha512 = "C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg==";
};
};
"ip-1.1.8" = {
@ -7159,13 +7159,13 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.154.0" = {
"n8n-core-0.154.1" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.154.0";
version = "0.154.1";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.154.0.tgz";
sha512 = "jBnLFpDCa93aK7bGFMAHZleNSU2q6h8zwRPQyDStjlc1J2gSOUAMHBqzz/3of9UbjTx7N/2JfkyC22rgFf5tSA==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.154.1.tgz";
sha512 = "LpwNxGxGpHrA3fJNeAL7qVAKrXj88MDWuK40JVnLXGgnWjdy9M8Gpz0ucHXBRuN0HxeCpCA+59edNsDUUaBAsQ==";
};
};
"n8n-design-system-0.53.0" = {
@ -7177,31 +7177,31 @@ let
sha512 = "QTPcnNOv9sp9RzT0I4cuB2lqEmHJrv+TBV1D8mZ3upas7ZMdNVLhGiRM8EgbeQoY5jsKlTA3nagTflNQy8H/tw==";
};
};
"n8n-editor-ui-0.181.0" = {
"n8n-editor-ui-0.181.1" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.181.0";
version = "0.181.1";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.181.0.tgz";
sha512 = "TmaCveuWjz5qZ9WOwczGF/XRnGkHqCrMx02r3GcgxoLVvOro2AklGYaY+CL2AsbEsiwoCfD8fF8yAqd5+cc95w==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.181.1.tgz";
sha512 = "NmkTic2XLgAgx/sKsKd8kPDuEuj7roBXT1uLcFdlz+mnn4LN12GFFyHO6GrOJC3lYA6SY6QQZ475/EpNsMzqLw==";
};
};
"n8n-nodes-base-0.213.0" = {
"n8n-nodes-base-0.213.1" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.213.0";
version = "0.213.1";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.213.0.tgz";
sha512 = "8Re6eUkZRR5Wy6UNsYFtB+rGXG+Ll30dr/PV/WWf71JMlH3mqCrfVEz1G1YeiUcfDNyL8F9re7sVzVZ1SDwr2w==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.213.1.tgz";
sha512 = "diU4FVseBaJ3wC/57o/snFHv19KMrWv3bxadFfpMDHYN1u6YB4L3GacpNgBE1CLPgGIptlVNhVJ4USInIIVDrw==";
};
};
"n8n-workflow-0.136.0" = {
"n8n-workflow-0.136.1" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.136.0";
version = "0.136.1";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.136.0.tgz";
sha512 = "nNsDxwSrdAruVF7sTgok8W24Kzy8eXCADPpocvnBofMrhcAhHCYV32dyqEyKLcnOfmyOhvkFsyCDF9R6vlKUzA==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.136.1.tgz";
sha512 = "Y7v72erInEIlXGjdUzJD/Cj4qagmNx6w5jqLCb/Z/t2VHBEXrBasHAA96leiVwx9VILlaMXMK/p6PJz3NNnpNA==";
};
};
"named-placeholders-1.1.3" = {
@ -11386,10 +11386,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.215.0";
version = "0.215.1";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.215.0.tgz";
sha512 = "r9Z4BGkVFSy0zKmZvA6HP9RMxd6MvTN11q5Txv+04xjmdg+LxJo3ES8znnOeMXPZrpQ2yB44kyRNzJMJdZt0Yg==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.215.1.tgz";
sha512 = "iJcgw8F8zop+Agyrq5x3xczr/uZSR/ghXltcfZ0D/mLe7RxeWvZk1kg0fxaX+sTBeAu0yhsPvib3EBeTqNTcJg==";
};
dependencies = [
(sources."@acuminous/bitsyntax-0.1.2" // {
@ -11534,7 +11534,7 @@ in
sources."@lezer/common-1.0.2"
sources."@lezer/css-1.1.1"
sources."@lezer/highlight-1.1.3"
sources."@lezer/html-1.3.0"
sources."@lezer/html-1.3.1"
sources."@lezer/javascript-1.4.1"
sources."@lezer/lr-1.3.3"
sources."@mapbox/node-pre-gyp-1.0.10"
@ -11754,7 +11754,7 @@ in
})
sources."available-typed-arrays-1.0.5"
sources."avsc-5.7.7"
(sources."aws-sdk-2.1312.0" // {
(sources."aws-sdk-2.1313.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -12238,7 +12238,7 @@ in
sources."inquirer-7.3.3"
sources."internal-slot-1.0.5"
sources."interpret-1.4.0"
(sources."ioredis-5.3.0" // {
(sources."ioredis-5.3.1" // {
dependencies = [
sources."denque-2.1.0"
];
@ -12528,7 +12528,7 @@ in
];
})
sources."mz-2.7.0"
(sources."n8n-core-0.154.0" // {
(sources."n8n-core-0.154.1" // {
dependencies = [
sources."concat-stream-2.0.0"
sources."readable-stream-3.6.0"
@ -12541,13 +12541,13 @@ in
sources."vue2-boring-avatars-0.3.8"
];
})
sources."n8n-editor-ui-0.181.0"
(sources."n8n-nodes-base-0.213.0" // {
sources."n8n-editor-ui-0.181.1"
(sources."n8n-nodes-base-0.213.1" // {
dependencies = [
sources."chokidar-3.5.2"
];
})
(sources."n8n-workflow-0.136.0" // {
(sources."n8n-workflow-0.136.1" // {
dependencies = [
sources."ast-types-0.15.2"
];

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.41";
version = "3.42";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-sNeuIcRJ249F9m7NBi5Vh4HMhWwDpNHAZsit1auVI5U=";
hash = "sha256-MolxbV+B/u2v+9dcdia1QzvElxX5arZMpu1DnRvUam4=";
};
vendorHash = "sha256-ZtHgZ0Mur102H2EvifsK3HYUQaI1dFMh/6eiJO09HBc=";
vendorHash = "sha256-79nX7l++brumkuFjKuDKxw6EhH0U+aYpia8fdSyY208=";
subPackages = [ "weed" ];

41
pkgs/applications/office/ledger/default.nix
View File

@ -1,30 +1,34 @@
{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3
, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }:
{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3, gpgme
, installShellFiles, texinfo, gnused, usePython ? false, gpgmeSupport ? false }:
stdenv.mkDerivation rec {
pname = "ledger";
version = "3.2.1";
version = "3.3.0";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger";
rev = "v${version}";
sha256 = "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6";
hash = "sha256-0hN6Hpmgwb3naV2K1fxX0OyH0IyCQAh1nZ9TMNAutic=";
};
outputs = [ "out" "dev" "py" ];
outputs = [ "out" "dev" ] ++ lib.optionals usePython [ "py" ];
buildInputs = [
(boost.override { enablePython = usePython; python = python3; })
gmp mpfr libedit gnused
] ++ lib.optional usePython python3;
] ++ lib.optionals gpgmeSupport [
gpgme
] ++ (if usePython
then [ python3 (boost.override { enablePython = true; python = python3; }) ]
else [ boost ]);
nativeBuildInputs = [ cmake texinfo installShellFiles ];
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DBUILD_DOCS:BOOL=ON"
(lib.optionalString usePython "-DUSE_PYTHON=true")
"-DUSE_PYTHON:BOOL=${if usePython then "ON" else "OFF"}"
"-DUSE_GPGME:BOOL=${if gpgmeSupport then "ON" else "OFF"}"
];
# by default, it will query the python interpreter for it's sitepackages location
@ -34,22 +38,6 @@ stdenv.mkDerivation rec {
--replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"'
'';
patches = [
# Add support for $XDG_CONFIG_HOME. Remove with the next release
(fetchpatch {
url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch";
sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk=";
excludes = [ "doc/NEWS.md" ];
})
# Fix included bug with boost >= 1.76. Remove with the next release
(fetchpatch {
url = "https://github.com/ledger/ledger/commit/1cb9b84fdecc5604bd1172cdd781859ff3871a52.patch";
sha256 = "sha256-ipVkRcTmnEvpfyPgMzLVJ9Sz8QxHeCURQI5dX8xh758=";
excludes = [ "test/regress/*" ];
})
];
installTargets = [ "doc" "install" ];
postInstall = ''
@ -57,17 +45,16 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://ledger-cli.org/";
description = "A double-entry accounting system with a command-line reporting interface";
homepage = "https://www.ledger-cli.org/";
changelog = "https://github.com/ledger/ledger/raw/v${version}/NEWS.md";
license = licenses.bsd3;
longDescription = ''
Ledger is a powerful, double-entry accounting system that is accessed
from the UNIX command-line. This may put off some users, as there is
no flashy UI, but for those who want unparalleled reporting access to
their data, there really is no alternative.
'';
platforms = platforms.all;
maintainers = with maintainers; [ jwiegley marsam ];
};

21
pkgs/development/libraries/gnutls/default.nix
View File

@ -7,6 +7,19 @@
, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit
, withSecurity ? true, Security # darwin Security.framework
# certificate compression - only zlib now, more possible: zstd, brotli
# for passthru.tests
, curlWithGnuTls
, emacs
, ffmpeg
, haskellPackages
, knot-resolver
, ngtcp2-gnutls
, ocamlPackages
, python3Packages
, qemu
, rsyslog
, samba
}:
assert guileBindings -> guile != null;
@ -105,6 +118,14 @@ stdenv.mkDerivation rec {
--replace "-lunistring" ""
'';
passthru.tests = {
inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver;
inherit (ocamlPackages) ocamlnet;
haskell-gnutls = haskellPackages.gnutls;
python3-gnutls = python3Packages.python3-gnutls;
rsyslog = rsyslog.override { withGnutls = true; };
};
meta = with lib; {
description = "The GNU Transport Layer Security Library";

1
pkgs/development/ocaml-modules/biocaml/default.nix
View File

@ -8,6 +8,7 @@ buildDunePackage rec {
version = "0.11.2";
minimalOCamlVersion = "4.11";
duneVersion = "3";
src = fetchFromGitHub {
owner = "biocaml";

12
pkgs/development/ocaml-modules/cfstream/default.nix
View File

@ -1,18 +1,18 @@
{ lib, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }:
{ lib, buildDunePackage, fetchFromGitHub, m4, camlp-streams, core_kernel, ounit }:
buildDunePackage rec {
pname = "cfstream";
version = "1.3.1";
version = "1.3.2";
useDune2 = true;
duneVersion = "3";
minimumOCamlVersion = "4.04.1";
minimalOCamlVersion = "4.04.1";
src = fetchFromGitHub {
owner = "biocaml";
repo = pname;
rev = version;
sha256 = "0qnxfp6y294gjsccx7ksvwn9x5q20hi8sg24rjypzsdkmlphgdnd";
hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ=";
};
patches = [ ./git_commit.patch ];
@ -21,7 +21,7 @@ buildDunePackage rec {
nativeBuildInputs = [ m4 ];
checkInputs = [ ounit ];
propagatedBuildInputs = [ core_kernel ];
propagatedBuildInputs = [ camlp-streams core_kernel ];
doCheck = true;

1
pkgs/development/ocaml-modules/phylogenetics/default.nix
View File

@ -26,6 +26,7 @@ buildDunePackage rec {
};
minimalOCamlVersion = "4.08";
duneVersion = "3";
nativeCheckInputs = [ bppsuite ];
checkInputs = [ alcotest ];

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.17.5";
version = "1.17.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "refs/tags/v${version}";
hash = "sha256-PLtIxA3XD9Mi33zRfciocJUml1HqGsWGITlLUKAJUss=";
hash = "sha256-917JTjNKvO/Gp9qvvd0Dd5Zjl+AQzUw8PfbH2MQ14Dg=";
};
propagatedBuildInputs = [

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

@ -2,7 +2,7 @@
let
pname = "allure";
version = "2.20.1";
version = "2.21.0";
in
stdenv.mkDerivation rec {
inherit pname version;
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz";
sha256 = "sha256-nq7PY4CVSqfuTzN7ZDChTfYalYKb4uBG8ZnIBd7ernI=";
sha256 = "sha256-fX/GNDUUxO8LvPoeoT+tf0n3EcgJlm6kc1lx0lfbiq4=";
};
dontConfigure = true;
dontBuild = true;

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

@ -11,22 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "0.19.3";
version = "0.20.1";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
hash = "sha256-MxbZlUlan58TVgcr2n5ZA+L01u90bYYqf88GU+sLmKk=";
hash = "sha256-wM8DawrniyJxj8Omgj+hiePa521p4hIAngfzEHFNO58=";
};
cargoHash = "sha256-HG43UCjPCB5bEH0GYPoHsOlaJQNPRrD175SuUJ6QbEI=";
patches = [
# make it possible to disable the static feature
# https://github.com/cargo-bins/cargo-binstall/pull/782
./fix-features.patch
];
cargoHash = "sha256-ZanPmdFMDGZhRHVVGt03OJWz8HnSYFdm42W6rpytu5Y=";
nativeBuildInputs = [
pkg-config

22
pkgs/development/tools/rust/cargo-binstall/fix-features.patch
View File

@ -1,22 +0,0 @@
--- a/crates/bin/Cargo.toml
+++ b/crates/bin/Cargo.toml
@@ -22,7 +22,7 @@ pkg-fmt = "zip"
pkg-fmt = "zip"
[dependencies]
-binstalk = { path = "../binstalk", version = "0.7.1" }
+binstalk = { path = "../binstalk", version = "0.7.1", default-features = false }
binstalk-manifests = { path = "../binstalk-manifests", version = "0.2.0" }
clap = { version = "4.1.1", features = ["derive"] }
crates_io_api = { version = "0.8.1", default-features = false }
--- a/crates/binstalk/Cargo.toml
+++ b/crates/binstalk/Cargo.toml
@@ -11,7 +11,7 @@ license = "GPL-3.0"
[dependencies]
async-trait = "0.1.61"
-binstalk-downloader = { version = "0.3.2", path = "../binstalk-downloader" }
+binstalk-downloader = { version = "0.3.2", path = "../binstalk-downloader", default-features = false }
binstalk-types = { version = "0.2.0", path = "../binstalk-types" }
cargo_toml = "0.14.0"
command-group = { version = "2.0.1", features = ["with-tokio"] }

4
pkgs/misc/fastly/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "fastly";
version = "6.0.0";
version = "6.0.3";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-meUKWAFKT6EgHtzgR6jjDCA8EUD1kVoT3reXaRheukw=";
hash = "sha256-6Qkt7ofNhnqikckUOTaEe5ptsYQ+9ELuuobhfnG7VTU=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,

2
pkgs/servers/mastodon/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-fuU92fydoazSXBHwA+DG//gRgWVYQ1M3m2oNS2iwv4I=";
sha256 = "sha256-e3rl/WuKXaUdeDEYvo1sSubuIwtBjkbguCYdAijwXOA=";
};
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ];

497
pkgs/servers/mastodon/gemset.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/servers/mastodon/source.nix
View File

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/mastodon/mastodon.git";
rev = "v4.0.2";
sha256 = "1szb11bss66yvh8750pzib3r0w1fm9h84sf5daqsnbm871hgzlw0";
rev = "v4.1.0";
sha256 = "00nc80s1hz4sdpq81hsv2r9da3bjn4lgwpk7w24zy2016iwjjwbb";
};
in applyPatches {
inherit src;

2
pkgs/servers/mastodon/version.nix
View File

@ -1 +1 @@
"4.0.2"
"4.1.0"

17
pkgs/tools/misc/intermodal/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "intermodal";
@ -8,19 +8,28 @@ rustPlatform.buildRustPackage rec {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "0mn0wm3bihn7ffqk0p79mb1hik54dbhc9diq1wh9ylpld2iqmz68";
hash = "sha256-yPyKo2j0Up8gDzi2xOBqpMwIw6rpXDCxc8fCuEblwFY=";
};
cargoSha256 = "1bvs23rb25qdwbrygzq11p8cvck5lxjp9llvs1cjdh0qzr65jwla";
cargoHash = "sha256-inJZTP4YwCZZ0JvSdGWnZbLN0A0B/+fz4g0XsfIQeq8=";
# include_hidden test tries to use `chflags` on darwin
checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd imdl \
--bash <($out/bin/imdl completions bash) \
--fish <($out/bin/imdl completions fish) \
--zsh <($out/bin/imdl completions zsh)
'';
meta = with lib; {
description = "User-friendly and featureful command-line BitTorrent metainfo utility";
homepage = "https://github.com/casey/intermodal";
license = licenses.cc0;
maintainers = with maintainers; [ Br1ght0ne ];
maintainers = with maintainers; [ Br1ght0ne xrelkd ];
mainProgram = "imdl";
};
}

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

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "mubeng";
version = "0.13.0";
version = "0.13.2";
src = fetchFromGitHub {
owner = "kitabisa";
repo = pname;
rev = "v${version}";
hash = "sha256-FfqldK2iDB4Cy5M1uMUDEikV8JMMBzh2kgmvtZiJTOc=";
hash = "sha256-EIglOoHL1ZmkFUn2MTU+ISQmaX96kCxelwk5ylHlMHk=";
};
vendorHash = "sha256-5YqourXzrRdfmWdHE/ZsRTze2h02ZHAsprQrSTZFrhY=";
vendorHash = "sha256-1RJAmz3Tw6c2Y7lXlXvq/aEkVLO+smkwuNJbi7aBUNo=";
ldflags = [
"-s"

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

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.8.8";
version = "2.8.9";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
hash = "sha256-limgyp13eh2FuD1MzqQn+NQ30fOJsvr8UT4kZrxnIPM=";
hash = "sha256-YjcvxDCIXHyc/7+lpg29wDrpe8WmQPWbhXvpIpWO17k=";
};
vendorHash = "sha256-nmZpYShVNAqBO8adxCSt9t3ocB3elWna06pIBG6dQNY=";
vendorHash = "sha256-DE2S70Jfd6Vgx7BXGbhSWTbRIbp8cbiuf8bolHCYMxg=";
modRoot = "./v2";
subPackages = [

6
pkgs/tools/security/pomerium-cli/default.nix
View File

@ -8,16 +8,16 @@ let
in
buildGoModule rec {
pname = "pomerium-cli";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "pomerium";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-lWrEWi9wT//9sTEJqo4BnjjzeYnmb2KFbVetXfsYk04=";
sha256 = "sha256-0JMMa85gMTZA0JtxpONVMakbsapAoCXdiL3+Whv5Pp0=";
};
vendorSha256 = "sha256-uME7g7zhA1ir1drmHB1FjLPJ1Km9XcvHHNIsIdOvYfo=";
vendorHash = "sha256-eATNBUQNspDdksF06VHIzwzEJfaFBlJt9OtONxH49s4=";
subPackages = [
"cmd/pomerium-cli"

6
pkgs/tools/security/step-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "step-cli";
version = "0.23.1";
version = "0.23.2";
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-fSVRDmgDbByAWVzvidrtqCQE+LzS1WpzOAt12ZiNBT4=";
hash = "sha256-d21TQRPRDEDYj7Fqf7R7mHj2tLPd/EXNkeL56KyLgIg=";
};
ldflags = [
@ -25,7 +25,7 @@ buildGoModule rec {
rm command/certificate/remote_test.go
'';
vendorHash = "sha256-oW1C0EEaNsT4ne1g4kyb+A8sbXgzCAJlhJHUmdH2r/0=";
vendorHash = "sha256-Oh8tldLuM3j17OUX1TkgyOL9Ae/x1H8FrB2lNbtZ8pI=";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

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

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.27.0";
version = "3.27.1";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-zhzYBub5TnJvInMAcAzvh78o4MWHD4EJNn8PbtvHies=";
hash = "sha256-oZfqRNKj/cQw7b933qzQWz1N25zXG5bmCjah4sA5wRY=";
};
vendorHash = "sha256-IiMFSYZ7kdb5HHPFuRJKi+WXLdERSwyph1vSEQ/7RRk=";

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

@ -32099,7 +32099,9 @@ with pkgs;
pavucontrol = callPackage ../applications/audio/pavucontrol { };
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
paraview = libsForQt5.callPackage ../applications/graphics/paraview {
python3 = python39;
};
parlatype = callPackage ../applications/audio/parlatype { };