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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-02 00:06:44 +00:00 committed by GitHub
commit f4fc464126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 106 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/release-combined.nix
View File

@ -98,7 +98,6 @@ in rec {
(onFullSupported "nixos.tests.login")
(onFullSupported "nixos.tests.misc")
(onFullSupported "nixos.tests.mutableUsers")
(onFullSupported "nixos.tests.nano")
(onFullSupported "nixos.tests.nat.firewall-conntrack")
(onFullSupported "nixos.tests.nat.firewall")
(onFullSupported "nixos.tests.nat.standalone")

6
pkgs/applications/audio/sptlrx/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "sptlrx";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "raitonoberu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Wk4vXm6sB+Rw0VFAhfD0GKxsP+1LwpS6VFHa3UENuJk=";
sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE=";
};
vendorSha256 = "sha256-l5gIbjB2rJyNmZBqrHo4kwClmAgjgDWHTs5KWzrfC08=";
vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0=";
ldflags = [ "-s" "-w" ];

26
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,27 +1,27 @@
{
"stable": {
"version": "98.0.4758.102",
"sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1",
"sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6",
"version": "99.0.4844.51",
"sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",
"sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1",
"deps": {
"gn": {
"version": "2021-12-07",
"version": "2022-01-10",
"url": "https://gn.googlesource.com/gn",
"rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
"sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
"rev": "80a40b07305373617eba2d5878d353532af77da3",
"sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv"
}
},
"chromedriver": {
"version": "98.0.4758.102",
"sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im",
"sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny",
"sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l"
"version": "99.0.4844.35",
"sha256_linux": "1q10mn34s03zy0nqcgrjd7ry53g4paxpwcki1bgicpcrwnjlzc3y",
"sha256_darwin": "0mcfry8vqqc8n1sgyn2azr8pc4lgjnkpnhz0ggjqm12njq0lfjfx",
"sha256_darwin_aarch64": "19wpqd5mq2vrgma899vbbdqhg660x47v4ppbz1r8dcg5r5y93x3s"
}
},
"beta": {
"version": "99.0.4844.45",
"sha256": "1j6s9r2k6zyyjk3f74k2103zlih96wrr2a83bk79fwc582af9505",
"sha256bin64": "0lqps8lf7yg9nn5z2iy6hfrx2df59hif8vhf0camx2lfmrkgw8qa",
"version": "99.0.4844.51",
"sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",
"sha256bin64": "1bayx03xf94ra0wid1jn10vysa6src4hmrdzdxf566rx9wcg29pk",
"deps": {
"gn": {
"version": "2022-01-10",

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

@ -85,13 +85,13 @@ let
sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==";
};
};
"@azure/ms-rest-js-2.6.0" = {
"@azure/ms-rest-js-2.6.1" = {
name = "_at_azure_slash_ms-rest-js";
packageName = "@azure/ms-rest-js";
version = "2.6.0";
version = "2.6.1";
src = fetchurl {
url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz";
sha512 = "4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g==";
url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.1.tgz";
sha512 = "LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw==";
};
};
"@azure/ms-rest-nodeauth-3.1.1" = {
@ -976,13 +976,13 @@ let
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
};
};
"aws-sdk-2.1082.0" = {
"aws-sdk-2.1083.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1082.0";
version = "2.1083.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1082.0.tgz";
sha512 = "aDrUZ63O/ocuC827ursDqFQAm3jhqsJu1DvMCCFg73y+FK9pXXNHp2mwdi3UeeHvtfxISCLCjuyO3VFd/tpVfA==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1083.0.tgz";
sha512 = "o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==";
};
};
"aws-sign2-0.7.0" = {
@ -4504,13 +4504,13 @@ let
sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
};
};
"n8n-editor-ui-0.132.0" = {
"n8n-editor-ui-0.132.1" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.132.0";
version = "0.132.1";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.0.tgz";
sha512 = "WOH1Lh+2VYTqBL75pe+WB0H2K8O/6BSW/Wsl5zXbrI0YXmaC9YEvSTAcmjxvjW+oYnYLfQR3p3j6g3AtNldiJQ==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.1.tgz";
sha512 = "Kggz0oSLjmh/kqIkerfTaPqGE+qk8mEK9Vs7ZxgmQ4CdRreELSBBVGZiuZALfDjm//+hUF2VnLU3PWUm6uqfDg==";
};
};
"n8n-nodes-base-0.163.0" = {
@ -7480,10 +7480,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.165.0";
version = "0.165.1";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.0.tgz";
sha512 = "PYg5cXEeH6YzVZaSDD9yOZbPtTM/yfaohbZjijyyzVmlOBnI6teQsaY+aLqK6ST4LfMfpB0ZkXpaiBj6xE9azA==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.1.tgz";
sha512 = "bezUoR+PGGZIoZ4fV7BfH3C9poVJj0GXBkswsA2nhCSGoE2WExhLFEh8mR1ExDUqCwe9mhVLUEdJHO/RNJAD4g==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@ -7524,7 +7524,7 @@ in
];
})
sources."@azure/ms-rest-azure-env-2.0.0"
(sources."@azure/ms-rest-js-2.6.0" // {
(sources."@azure/ms-rest-js-2.6.1" // {
dependencies = [
sources."form-data-2.5.1"
];
@ -7664,7 +7664,7 @@ in
];
})
sources."avsc-5.7.3"
(sources."aws-sdk-2.1082.0" // {
(sources."aws-sdk-2.1083.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -8230,7 +8230,7 @@ in
];
})
sources."n8n-design-system-0.12.0"
sources."n8n-editor-ui-0.132.0"
sources."n8n-editor-ui-0.132.1"
(sources."n8n-nodes-base-0.163.0" // {
dependencies = [
sources."iconv-lite-0.6.3"

21
pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
View File

@ -1,28 +1,41 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
version = "6.9.5";
version = "6.9.7";
pname = "frostwire";
src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4=";
sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc=";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/java
mv $(ls */*.jar) $out/share/java
makeWrapper $out/share/java/frostwire $out/bin/frostwire \
--prefix PATH : ${jre}/bin/
--prefix PATH : ${jre}/bin \
--prefix LD_LIBRARY_PATH : $out/share/java \
--set JAVA_HOME "${jre}"
substituteInPlace $out/share/java/frostwire \
--replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \
"export JAVA_PROGRAM_DIR=${jre}/bin/"
substituteInPlace $out/share/java/frostwire.desktop \
--replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U"
runHook postInstall
'';
meta = with lib; {
homepage = "https://www.frostwire.com/";
description = "BitTorrent Client and Cloud File Downloader";
license = licenses.gpl2;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ gavin ];
platforms = [ "x86_64-linux"];
};

4
pkgs/applications/networking/seafile-client/default.nix
View File

@ -4,13 +4,13 @@
mkDerivation rec {
pname = "seafile-client";
version = "8.0.5";
version = "8.0.6";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx";
sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o=";
};
nativeBuildInputs = [ pkg-config cmake ];

6
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-T0xThL4VHzpNMQV8fTVnG7R+D9ol/Z7a4MYMXbkQ680=";
sha256 = "sha256-60XEc0V8stbl+JozTqu8yO37K1NXX/X2xFkcO9p/QNY=";
};
vendorSha256 = "sha256-tJg/vekGUYP4q1ZP5UV3+lXv6bht4doVV3IaGH+4uf8=";
vendorSha256 = "sha256-aMD4a+jwCINcHV/z5UyTF+o3BzN9wviz+kLwDys9/BI=";
nativeBuildInputs = [ installShellFiles ];

5
pkgs/applications/virtualization/podman/wrapper.nix
View File

@ -3,6 +3,7 @@
, makeWrapper
, symlinkJoin
, lib
, stdenv
, extraPackages ? []
, podman # Docker compat
, runc # Default container runtime
@ -15,6 +16,7 @@
, iptables
, iproute2
, catatonit
, gvproxy
}:
# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
@ -25,6 +27,7 @@ let
podman = podman-unwrapped;
binPath = lib.makeBinPath ([
] ++ lib.optionals stdenv.isLinux [
runc
crun
conmon
@ -40,6 +43,8 @@ let
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
paths = [
gvproxy
] ++ lib.optionals stdenv.isLinux [
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
podman.rootlessport
];

34
pkgs/data/themes/nordic/default.nix
View File

@ -7,70 +7,70 @@
stdenv.mkDerivation rec {
pname = "nordic";
version = "unstable-2022-01-08";
version = "unstable-2022-02-26";
srcs = [
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86";
sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc=";
rev = "0da58e462e8ba6c71245d13fbddac950b72018ae";
sha256 = "sha256-w7e3DqQV4L/OvntKHJA4+3Dj6dRnlH73SxvW770QIyU=";
name = "Nordic";
})
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "46c9e6665963ccb54938d7730e520bd8c52f4307";
sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI=";
rev = "9daf11acf3419e2f23d0993ce862a1c944fb8519";
sha256 = "sha256-zGgw6THLX7q19BDsllPUrWqQcL6FYAewcyqjQdXzLzg=";
name = "Nordic-standard-buttons";
})
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "da5c930386427fce65ea185f164709c8a20e362f";
sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0=";
rev = "a40819bd00160f987cdf254ce8c34eabebecf0eb";
sha256 = "sha256-rSNLdxTfvzTFzI5723WIGRS+NZ8iqUOUliDpkznZrwE=";
name = "Nordic-darker";
})
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7";
sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss=";
rev = "4e69cf6e1798938ab7c5795940c663d866ce8201";
sha256 = "sha256-p8VaKeKxEiYX4oVqWoyschAq0j/LvPq9yD/awaHKRZw=";
name = "Nordic-darker-standard-buttons";
})
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "259e30ce13566214c7594b038dd2c240648a07a0";
sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM=";
rev = "866629583187b914725f05683125fde7f6c280f1";
sha256 = "sha256-TQ4G5W87zpTrLU+f+eb5VHwaWuKSbItXCgXSL33U8As=";
name = "Nordic-bluish-accent";
})
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30";
sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k=";
rev = "f3702ae02e3caaf74eab0ef9156af9f2a476021b";
sha256 = "sha256-drXRfZxCrH2vAXjZSAjWEHcQrehxnM0WLkgbh+cFJhI=";
name = "Nordic-bluish-accent-standard-buttons";
})
(fetchFromGitHub {
owner = "EliverLara";
repo = "${pname}-polar";
rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f";
sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk=";
rev = "4cf3e5c30ebd17a3d53ab0337c191e304feff7b5";
sha256 = "sha256-LTCJ7AyABQDTDkjuqcXaKXePFwOpmXeKaW2mWYah4ao=";
name = "Nordic-Polar";
})
(fetchFromGitHub {
owner = "EliverLara";
repo = "${pname}-polar";
rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06";
sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU=";
rev = "72cbd567212b21ea20769fe244c148f799435536";
sha256 = "sha256-qNIyr+Eo0dzPVh9PxDCHv0e6pswACbf9nLhAG75YEYc=";
name = "Nordic-Polar-standard-buttons";
})
];

1
pkgs/development/compilers/llvm/14/libcxxabi/default.nix
View File

@ -82,5 +82,6 @@ stdenv.mkDerivation rec {
# the UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ];
broken = true; # TODO: gnu-install-dirs.patch fails to apply
};
}

1
pkgs/development/compilers/llvm/14/libunwind/default.nix
View File

@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
I). It is a dependency of the C++ ABI library, and sometimes is a
dependency of other runtimes.
'';
broken = true; # TODO: gnu-install-dirs.patch fails to apply
};
}

1
pkgs/development/compilers/llvm/14/lldb/default.nix
View File

@ -115,6 +115,7 @@ stdenv.mkDerivation (rec {
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E'
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";

1
pkgs/development/compilers/llvm/14/openmp/default.nix
View File

@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
# "All of the code is dual licensed under the MIT license and the UIUC
# License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
broken = true; # TODO: gnu-install-dirs.patch fails to apply
};
}

3
pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
View File

@ -24,7 +24,6 @@ lib.makePackageOverridable
code = "${src}/${file}";
}
// lib.optionalAttrs document { documentationRoot = src; }
// lib.optionalAttrs document { documentationRoot = "${src}"; }
)
)

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "decopatch";
version = "1.4.9";
version = "1.4.10";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8=";
hash = "sha256-lX9JyT9BUBgsI/j7UdE7syE+DxenngnIzKcFdZi1VyA=";
};
nativeBuildInputs = [

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

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
version = "6.7.2";
version = "6.8.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "v${version}";
sha256 = "sha256-NyoFJ3HVxE3AdCCZCZrEk4dDiTIv9cGZYPHVre/PMO4=";
sha256 = "sha256-5G+ALFDEClItXvSQFGari0QdhW+RGV8FukxUoxqphFg=";
};
propagatedBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.3.9";
version = "1.3.10";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "v${version}";
hash = "sha256-3jL9qu4kKpjLoNboMRSp8w/8K2jf+7z8BZsvzYVUjPc=";
hash = "sha256-XvQDCCxqqY902cpn7Ee48XOvbjBhs0UsJH/b4skjazE=";
};
nativeBuildInputs = [

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "rokuecp";
version = "0.14.1";
version = "0.15.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "ctalkington";
repo = "python-rokuecp";
rev = version;
hash = "sha256-K9R//xbyXaJ+AHmt42Fv40j43UkvKVyAFiXAq+P4mh8=";
hash = "sha256-yNmnCoHIBlpQCLd+YcsKCKd1wWh8WZNpILWmChZGWH4=";
};
nativeBuildInputs = [

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jql";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "yamafaktory";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mFTJJCoC5nxo5ugJdi+MmssV70yKrQQsH+a+K7hTyS8=";
sha256 = "sha256-CntAxOsAaKkCvQanLZ4d99VEGrbsVM+IYOhUuimvjlA=";
};
cargoSha256 = "sha256-aclfFy2tQL57EaIsg1e30JCF5nX2Cm/MaxeSPtR/Uas=";
cargoSha256 = "sha256-mzHLAmm0wvF35ku+wg6QG/pKwIFjb22fOtBmMhgC0Ik=";
meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust";

4
pkgs/games/warzone2100/default.nix
View File

@ -42,11 +42,11 @@ in
stdenv.mkDerivation rec {
inherit pname;
version = "4.2.4";
version = "4.2.6";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "sha256-IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg=";
sha256 = "sha256-sdHc/i1ffbTAY7ehO6LsIa+ll+LHkuXIwcwTIEOY28g=";
};
buildInputs = [

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

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.631";
version = "0.20.643";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1y5SQzizjslQ5+JWGrrtk45uvI/hOMnwLL69NhBmNMc=";
sha256 = "EdAUF42R1CISzN8LmzmYyHjAxWQlQv8NUKSInMkSZUA=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

4
pkgs/tools/networking/p2p/gtk-gnutella/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "gtk-gnutella";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "gtk-gnutella";
repo = "gtk-gnutella";
rev = "v${version}";
sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4=";
sha256 = "sha256-LbSUdU+a9G8qL7gCZVJQ6UQMATpOMtktY6FeOkUuaYI=";
};
nativeBuildInputs = [

30
pkgs/tools/security/cfripper/default.nix
View File

@ -3,38 +3,18 @@
, python3
}:
let
py = python3.override {
packageOverrides = self: super: {
# pycfmodel is pinned, https://github.com/Skyscanner/cfripper/issues/204
pycfmodel = super.pycfmodel.overridePythonAttrs (oldAttrs: rec {
version = "0.13.0";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = "pycfmodel";
rev = version;
hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A=";
};
});
};
};
in
with py.pkgs;
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
version = "1.3.3";
version = "1.4.2";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = version;
hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4=";
hash = "sha256-WSDCYKiU1VTi3j7vZ87HjHOShIN+PF7pwR4IVTalbmo=";
};
propagatedBuildInputs = with py.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
boto3
cfn-flip
click
@ -45,7 +25,7 @@ buildPythonApplication rec {
setuptools
];
checkInputs = with py.pkgs; [
checkInputs = with python3.pkgs; [
moto
pytestCheckHook
];

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

@ -8984,10 +8984,7 @@ with pkgs;
podiff = callPackage ../tools/text/podiff { };
podman = if stdenv.isDarwin then
callPackage ../applications/virtualization/podman { }
else
callPackage ../applications/virtualization/podman/wrapper.nix { };
podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
podman-unwrapped = callPackage ../applications/virtualization/podman { };
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};