Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-08-02 00:01:57 +00:00 committed by GitHub
commit 1e74d60033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 961 additions and 322 deletions

View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (lib) literalExpression mdDoc mkEnableOption mkIf mkOption mkPackageOptionMD mkRenamedOptionModule types versionAtLeast;
cfg = config.services.hedgedoc;
# 21.03 will not be an official release - it was instead 21.05. This
@ -32,6 +32,7 @@ in
];
options.services.hedgedoc = {
package = mkPackageOptionMD pkgs "hedgedoc" { };
enable = mkEnableOption (lib.mdDoc "the HedgeDoc Markdown Editor");
groups = mkOption {
@ -107,6 +108,13 @@ in
{option}`protocolUseSSL`.
'';
};
enableStatsApi = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enables or disables the /status and /metrics endpoint.
'';
};
hsts = {
enable = mkOption {
type = types.bool;
@ -1018,16 +1026,6 @@ in
`HedgeDoc` is running.
'';
};
package = mkOption {
type = types.package;
default = pkgs.hedgedoc;
defaultText = literalExpression "pkgs.hedgedoc";
description = lib.mdDoc ''
Package that provides HedgeDoc.
'';
};
};
config = mkIf cfg.enable {
@ -1060,7 +1058,7 @@ in
serviceConfig = {
WorkingDirectory = cfg.workDir;
StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ];
ExecStart = "${cfg.package}/bin/hedgedoc";
ExecStart = "${lib.getExe cfg.package}";
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
Environment = [
"CMD_CONFIG_FILE=${cfg.workDir}/config.json"

View File

@ -966,18 +966,23 @@ self: super: {
sniprun =
let
version = "1.3.5";
version = "1.3.6";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "v${version}";
hash = "sha256-D2nHei7mc7Yn8rgFiWFyaR87wQuryv76B25BYOpyp2I=";
hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
inherit version src;
cargoHash = "sha256-TG84BeYm7K5Dn0CvMvv1gzqeX246JPks1qcwkfcsG8c=";
# Cargo.lock is outdated
preBuild = ''
cargo update --offline
'';
cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -3018,8 +3018,8 @@ let
mktplcRef = {
name = "crates";
publisher = "serayuzgur";
version = "0.5.10";
sha256 = "1dbhd6xbawbnf9p090lpmn8i5gg1f7y8xk2whc9zhg4432kdv3vd";
version = "0.6.0";
sha256 = "080zd103vjrz86vllr1ricq2vi3hawn4534n492m7xdcry9l9dpc";
};
meta = {
license = lib.licenses.mit;

View File

@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}:
in rec {
stable = fetchurl rec {
version = "8.0.1";
version = "8.0.2";
url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz";
hash = "sha256-IgNfODa0+cOxlArZD5uePBvgkjQjbSqA2JMYBTXHW30=";
hash = "sha256-bsj7byxy1XbLEfUrL41Zr2RASAIVRlHRIrmEZtkdyEc=";
## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {

View File

@ -10,13 +10,13 @@
}:
let
version = "1.2.0-1";
version = "1.3.0-1";
src = fetchFromGitHub {
owner = "mucommander";
repo = "mucommander";
rev = version;
sha256 = "sha256-OrtC7E/8n9uEo7zgFHYQqXV3qLpdKtxwbwZfxoOqTqA=";
sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw=";
};
postPatch = ''
@ -49,7 +49,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-T4UhEzkaYh237+ZsoQTv1RgqcAKY4dPc/3x+dEie4A8=";
outputHash = "sha256-9tCcUg7hDNbkZiQEWtVRsUUfms73aU+vt5tQsfknM+E=";
};
in

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.116.0";
version = "0.116.1";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
hash = "sha256-Q5aSpKBgPa2EBEI9qJAw/WRM9LjHa2rdsThMFRV2/F8=";
rev = "refs/tags/v${version}";
hash = "sha256-YACMkfDdcou+Yve3D/ealaku1pzuWxInDtnhL/Y+cWw=";
};
vendorHash = "sha256-ScAjE+va/5K/9sYt05X1GmTJp8AUopMukWN/WlPG1sg=";
vendorHash = "sha256-l7XCCsJbqZ4g1U8G3VMVArMofPgchUP0T7wGF57d4rA=";
doCheck = false;

View File

@ -3,7 +3,8 @@
, fetchurl
, appimageTools
, makeWrapper
, electron
# graphs will not sync without matching upstream's major electron version
, electron_24
, git
, nix-update-script
}:
@ -56,10 +57,11 @@ in {
postFixup = ''
# set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \
--set "LOCAL_GIT_DIRECTORY" ${git} \
--add-flags $out/share/${pname}/resources/app \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
'';
passthru.updateScript = nix-update-script { };

View File

@ -17,11 +17,16 @@
stdenv.mkDerivation rec {
pname = "freefilesync";
version = "12.4";
version = "12.5";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip";
hash = "sha256-rH1xp0/ggWWyUPcksY2GhYtUddTGrEDxdL/uODurvDo=";
# The URL only redirects to the file on the second attempt
postFetch = ''
rm -f $out
tryDownload "$url"
'';
hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM=";
};
sourceRoot = ".";
@ -31,8 +36,12 @@ stdenv.mkDerivation rec {
# Disable loading of the missing Animal.dat
(fetchpatch {
url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch";
postFetch = ''
substituteInPlace $out \
--replace "-std=c++2b" "-std=c++23"
'';
excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ];
hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74=";
hash = "sha256-CtUC94AoYTxoqSMWZrzuO3jTD46rj11JnbNyXtWckCo=";
})
# Fix build with GTK 3
(fetchpatch {

View File

@ -39,7 +39,7 @@
stdenv.mkDerivation rec {
pname = "armcord";
version = "3.2.0";
version = "3.2.1";
src =
let
@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
sha256 = "sha256-7lT69fU7tGujhbDTX0tYpkEquoswMCZOGAUhk2Nr+C0=";
sha256 = "1cfbypn9kh566s09c1bvxswpc0r11pmsvxlh4dixd5s622ia3h7r";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
sha256 = "sha256-a5qLK8WjrlmKF24U9SiEpY+SNWuHf6gHJBym5IM8HZ4=";
sha256 = "0mb6az0mzjz2zal7igigjcigg3phn2ijfw04igpl7q2rg6ha3z00";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

View File

@ -1,9 +1,9 @@
{
"version" = "1.11.36";
"version" = "1.11.37";
"hashes" = {
"desktopSrcHash" = "sha256-MMTuyyUXur5Fy24aXPWtZbQLAaXR2R7coEi8ZOJo1YI=";
"desktopYarnHash" = "03wmdqnxzjrvdypwrb5z564liiqamwn6qmw2fww1mja8dkdkx5ng";
"webSrcHash" = "sha256-u+Y/iLRlTd5RkczF6qIaer9HKFnm8LUGP8ZnB/WfiGI=";
"webYarnHash" = "0s9ly1hr9jvb2asgjf6g5n5n5w6qh51wkwyl7ps891c0hv9m28zm";
"desktopSrcHash" = "sha256-6YiMAmOb0lSaLDE/ohVpZFbl4J1NxS9xNFFcebVW9MA=";
"desktopYarnHash" = "1ksj99g649kvilr850rkk8nkl55z7vz7m8159777kjikakzra2ly";
"webSrcHash" = "sha256-zFRoL/bnic6Waaiz7Vfama4qzlYKk0TTr5zPK6PNSpM=";
"webYarnHash" = "1lpd9mmg51jnhdr2zfisxdpc4i64kn4bpzkxqzip7dnn9iz432kw";
};
}

View File

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230723-1";
version = "20230730";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-EHwQHFKahjpP8OOIY0ZRpkmYZYiDNteeMLkRwJIEp7g=";
hash = "sha256-5gXeAX3eV70p5wdQEMXv5QAv3vXH2OH46XL2rY0AUvE=";
};
postPatch = ''

View File

@ -115,6 +115,7 @@ stdenv.mkDerivation rec {
free = false;
};
maintainers = with maintainers; [ lhvwb lukegb atemu ];
mainProgram = "ts3client";
platforms = [ "x86_64-linux" ];
};
}

View File

@ -1,23 +1,28 @@
{stdenv, fetchurl}:
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
version = "4.9j";
stdenv.mkDerivation (finalAttrs: {
pname = "paml";
src = fetchurl {
url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
sha256 = "0qflf3i27x6jwks3c6q560m1q8r043ja96syah145113iz5wdalp";
version = "4.10.7";
src = fetchFromGitHub {
owner = "abacus-gene";
repo = "paml";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s=";
};
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: /build/ccKomtcd.o:(.bss+0x4544): multiple definition of `SeqTypes';
# /build/ccx7EsgU.o:(.bss+0x2a0dfdc): first defined here
env.NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_POSIX_C_SOURCE";
preBuild = ''
cd ./src/
'';
installPhase = ''
runHook preInstall
mkdir -pv $out/bin
cp -v codeml $out/bin
cp -v baseml $out/bin
@ -28,12 +33,16 @@ stdenv.mkDerivation rec {
cp -v mcmctree $out/bin
cp -v pamp $out/bin
cp -v yn00 $out/bin
runHook postInstall
'';
meta = {
description = "Phylogenetic Analysis by Maximum Likelihood (PAML)";
longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.";
license = "non-commercial";
license = lib.licenses.gpl3Only;
homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html";
changelog = "https://github.com/abacus-gene/paml/releases/tag/${finalAttrs.src.rev}";
platforms = lib.platforms.unix;
};
}
})

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cbmc";
version = "5.87.0";
version = "5.88.1";
src = fetchFromGitHub {
owner = "diffblue";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-aBqJqsZK5O3yWTQ1BEej0eeDI8JcsnO6sIv7eH6wnkw=";
sha256 = "sha256-bfrtYqTMU/Nib0wZjS/t0kg5sBsuQuq9GaHX4PxL7tU=";
};
nativeBuildInputs = [

View File

@ -27,7 +27,7 @@
}:
let
version = "1.15.1";
version = "1.15.2";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -99,20 +99,9 @@ stdenv.mkDerivation rec {
owner = "dnkl";
repo = "foot";
rev = version;
hash = "sha256-YCwmPSn+XtF7HkMOFJft7j/2vr+8UE59yu/iGZ1dT8A=";
hash = "sha256:1iz9l01fpryc335pb0c3qi67fmmfplizv5pbc9s578mxl5j9dxg4";
};
patches = [
# Check viewporter protocol support before using it, fixes crash under Mir
# Remove when https://codeberg.org/dnkl/foot/pulls/1445 in version > 1.15.1
(fetchpatch {
name = "0001-foot-dont-try-to-use-a-non-existing-viewporter-interface.patch";
url = "https://codeberg.org/dnkl/foot/commit/9d75c551465fa3dbb3cd20ae87d6de294fcebce1.patch";
excludes = [ "CHANGELOG.md" ];
hash = "sha256-sVfGbudsmwh7phbbobBgSXoGe1lKJ8s1UdyBnVLmLYQ=";
})
];
depsBuildBuild = [
pkg-config
];

View File

@ -1,15 +1,15 @@
{
"version": "16.1.2",
"repo_hash": "sha256-A9JkBwGym+CPpb5B7+Kwt8Ej4PGSHc3ZOgUA28hdyN8=",
"yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al",
"version": "16.1.3",
"repo_hash": "sha256-PI0nmwfk8uu74NJkavbbJR9/jDN9SS0Z9Axe4UmT2kk=",
"yarn_hash": "0wykn0vq16n8mz4jfh7dfyp9javzhqlfwmc5i1zm07gld91nirlm",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.1.2-ee",
"rev": "v16.1.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.1.2",
"GITLAB_PAGES_VERSION": "16.1.2",
"GITALY_SERVER_VERSION": "16.1.3",
"GITLAB_PAGES_VERSION": "16.1.3",
"GITLAB_SHELL_VERSION": "14.23.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.5",
"GITLAB_WORKHORSE_VERSION": "16.1.2"
"GITLAB_WORKHORSE_VERSION": "16.1.3"
}
}

View File

@ -13,7 +13,7 @@
}:
let
version = "16.1.2";
version = "16.1.3";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -24,7 +24,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-/yCmFbmKTp8V8CjdhoAPpAdwNEcaP/wB0oAeTLdMESo=";
sha256 = "sha256-g9K1dFcrUkWJInPrwg9fz/TEK35GrjqFpUS2bnemwLQ=";
};
vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA=";

View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "3.77.0";
version = "3.79.0";
rev = "v${version}-gitlab";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
sha256 = "sha256-tHNxPwm1h1wyXuzUUadz5YcRkPdc0QeayMIRt292uf8=";
sha256 = "sha256-JOXJ8HSTf7yW78SlYzbdn7IAbSwv/UE/W3oSJRyGrAQ=";
};
vendorHash = "sha256-/ITZBh0vRYHb6fDUZQNRwW2pmQulJlDZ8EbObUBtsz4=";
vendorHash = "sha256-4cxfyG1uhqgIheAVDQbIDb4MRSqAUtLgxGYt5MuNfKw=";
patches = [
./Disable-inmemory-storage-driver-test.patch

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.1.2";
version = "16.1.3";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-T33/SnV+aWUjfRKxVOQNWaPtFnounMkCXAeQCQ9w5RY=";
sha256 = "sha256-FSdew0HMbgEAzVoDhINDIQQs8Q63AHu8mu/dKo+wP9k=";
};
vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0=";

View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.1.2";
version = "16.1.3";
src = fetchFromGitLab {
owner = data.owner;

View File

@ -97,7 +97,7 @@ rec {
extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
patches = [
patches = lib.optionals (lib.versionOlder version "23") [
# This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver.
# It could be removed when a version incorporating this patch is released.
(fetchpatch {
@ -105,6 +105,7 @@ rec {
url = "https://github.com/moby/moby/pull/43136.patch";
hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
})
] ++ lib.optionals (lib.versionOlder version "23.0.5") [
(fetchpatch {
name = "fix-issue-with-go-1.20.6.patch";
url = "https://github.com/moby/moby/pull/45972.patch";
@ -181,14 +182,13 @@ rec {
nativeBuildInputs = [
makeWrapper pkg-config go-md2man go libtool installShellFiles
];
buildInputs = lib.optional (!clientOnly) sqlite
++ lib.optional withLvm lvm2
++ lib.optional withBtrfs btrfs-progs
++ lib.optional withSystemd systemd
++ lib.optional withSeccomp libseccomp
++ plugins;
patches = [
buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23") [
glibc
glibc.static
];
patches = lib.optionals (lib.versionOlder version "23.0.5") [
(fetchpatch {
name = "fix-issue-with-go-1.20.6.patch";
url = "https://github.com/docker/cli/pull/4441.patch";
@ -222,7 +222,7 @@ rec {
cd -
'';
outputs = ["out" "man"];
outputs = ["out"] ++ lib.optional (lib.versionOlder version "23") "man";
installPhase = ''
cd ./go/src/${goPackagePath}
@ -244,13 +244,13 @@ rec {
installShellCompletion --bash ./contrib/completion/bash/docker
installShellCompletion --fish ./contrib/completion/fish/docker.fish
installShellCompletion --zsh ./contrib/completion/zsh/_docker
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && lib.versionOlder version "23") ''
# Generate man pages from cobra commands
echo "Generate man pages from cobra"
mkdir -p ./man/man1
go build -o ./gen-manpages github.com/docker/cli/man
./gen-manpages --root . --target ./man/man1
'' + ''
'' + lib.optionalString (lib.versionOlder version "23") ''
# Generate legacy pages from markdown
echo "Generate legacy manpages"
./man/md2man-all.sh -q
@ -292,4 +292,18 @@ rec {
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};
docker_24 = callPackage dockerGen rec {
version = "24.0.5";
cliRev = "v${version}";
cliHash = "sha256-u1quVGTx/p8BDyRn33vYyyuE5BOhWMnGQ5uVX0PZ5mg=";
mobyRev = "v${version}";
mobyHash = "sha256-JQjRz1fHZlQRkNw/R8WWLV8caN3/U3mrKKQXbZt2crU=";
runcRev = "v1.1.8";
runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
containerdRev = "v1.7.1";
containerdHash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY=";
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};
}

View File

@ -53,4 +53,5 @@ mapAliases {
triton = pkgs.triton; # Added 2023-05-06
typescript = pkgs.typescript; # Added 2023-06-21
vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27
zx = pkgs.zx; # added 2023-08-01
}

View File

@ -395,5 +395,4 @@
, "yarn"
, "yo"
, "@zwave-js/server"
, "zx"
]

View File

@ -151836,79 +151836,4 @@ in
bypassCache = true;
reconstructLock = true;
};
zx = nodeEnv.buildNodePackage {
name = "zx";
packageName = "zx";
version = "7.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/zx/-/zx-7.2.3.tgz";
sha512 = "QODu38nLlYXg/B/Gw7ZKiZrvPkEsjPN3LQ5JFXM7h0JvwhEdPNNl+4Ao1y4+o3CLNiDUNcwzQYZ4/Ko7kKzCMA==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
sources."@types/fs-extra-11.0.1"
sources."@types/jsonfile-6.1.1"
sources."@types/minimist-1.2.2"
sources."@types/node-18.16.19"
sources."@types/ps-tree-1.1.2"
sources."@types/which-3.0.0"
sources."braces-3.0.2"
sources."chalk-5.3.0"
sources."data-uri-to-buffer-4.0.1"
sources."dir-glob-3.0.1"
sources."duplexer-0.1.2"
sources."event-stream-3.3.4"
sources."fast-glob-3.3.0"
sources."fastq-1.15.0"
sources."fetch-blob-3.2.0"
sources."fill-range-7.0.1"
sources."formdata-polyfill-4.0.10"
sources."from-0.1.7"
sources."fs-extra-11.1.1"
sources."fx-28.0.0"
sources."glob-parent-5.1.2"
sources."globby-13.2.2"
sources."graceful-fs-4.2.11"
sources."ignore-5.2.4"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.3"
sources."is-number-7.0.0"
sources."isexe-2.0.0"
sources."jsonfile-6.1.0"
sources."map-stream-0.1.0"
sources."merge2-1.4.1"
sources."micromatch-4.0.5"
sources."minimist-1.2.8"
sources."node-domexception-1.0.0"
sources."node-fetch-3.3.1"
sources."path-type-4.0.0"
sources."pause-stream-0.0.11"
sources."picomatch-2.3.1"
sources."ps-tree-1.2.0"
sources."queue-microtask-1.2.3"
sources."reusify-1.0.4"
sources."run-parallel-1.2.0"
sources."slash-4.0.0"
sources."split-0.3.3"
sources."stream-combiner-0.0.4"
sources."through-2.3.8"
sources."to-regex-range-5.0.1"
sources."universalify-2.0.0"
sources."web-streams-polyfill-3.2.1"
sources."webpod-0.0.2"
sources."which-3.0.1"
sources."yaml-2.3.1"
];
buildInputs = globalBuildInputs;
meta = {
description = "A tool for writing better scripts";
homepage = "https://github.com/google/zx#readme";
license = "Apache-2.0";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}

View File

@ -8,8 +8,11 @@
, python-dateutil
, sqlite-fts4
, tabulate
, pluggy
, pytestCheckHook
, hypothesis
, testers
, sqlite-utils
}:
buildPythonPackage rec {
@ -35,6 +38,7 @@ buildPythonPackage rec {
python-dateutil
sqlite-fts4
tabulate
pluggy
];
nativeCheckInputs = [
@ -46,6 +50,10 @@ buildPythonPackage rec {
"sqlite_utils"
];
passthru.tests.version = testers.testVersion {
package = sqlite-utils;
};
meta = with lib; {
description = "Python CLI utility and library for manipulating SQLite databases";
homepage = "https://github.com/simonw/sqlite-utils";

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "vsure";
version = "2.6.2";
version = "2.6.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8AqxLIrsFtAazH+ZqhXbkYNhlAhQ5XL/tNFRAGLh2kk=";
hash = "sha256-d9t/zO1ROCndS+5kiFVyDbs+96z7GMHaH6T82b8hl40=";
};
propagatedBuildInputs = [

View File

@ -30,7 +30,7 @@ let
aarch64-linux = "aarch64-unknown-linux-musl";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
buck2-version = "2023-07-18";
buck2-version = "2023-08-01";
src =
let
hashes = builtins.fromJSON (builtins.readFile ./hashes.json);

View File

@ -1,6 +1,6 @@
{ "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh"
, "x86_64-linux": "sha256-vYEE1VXzT9qT2ImYYuWPCw/1mTrzngrUzxMBNldaUEo="
, "x86_64-darwin": "sha256-0S82F2m6CX7ra/uByBuaGMVXP1ECN7Ydi9VEyrxYdTs="
, "aarch64-linux": "sha256-zghI4zvm/MN8plIB+nuv/tfd8DJ7mEXMc39PW55ieds="
, "aarch64-darwin": "sha256-euzixGUDb3W9B86HYPAgcNiTu3jxUVULAfNMKkFz5gU="
, "x86_64-linux": "sha256-wZULK2FPZ4GtQ5MMQmgfmtbMHJ7sPbue2RdVY0dmRuE="
, "x86_64-darwin": "sha256-FmayArw2gswKjAEv0AzpFZNiXNx3GmJnPwH9g+Y/BGU="
, "aarch64-linux": "sha256-3M1dRIFU0CwoVCbmq3oghhz51wW37melzt9hdIHqzzY="
, "aarch64-darwin": "sha256-UAe73UNDSLL8OHqzAd+NOwwtW4bpVBz/aL4wdy3VuYg="
}

View File

@ -38,16 +38,16 @@ let
in
stdenv.mkDerivation rec {
pname = "mysql-shell";
version = "8.0.33";
version = "8.0.34";
srcs = [
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
hash = "sha256-ElcAOvyQjXNns35p4J+jnGu8orZR81Itz/fxYh7Usbs=";
hash = "sha256-QY1PmhGw3PhqZ79+H/Xbb9uOvmrBlFQRS7idnV5OXF0=";
})
(fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI=";
hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0=";
})
];

View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-all-features";
version = "1.9.0";
version = "1.10.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-OLnz1SmMLs/yats/lZugqNUlBQHSNR1bOuEmnHGdoN8=";
hash = "sha256-/w3Xd7PXUNtqzRYmUqJtth+GDuXSnsk1NiYCTYsHuAQ=";
};
cargoHash = "sha256-Gg5tF8IvbtIoqR0AKRS7IbcCNOCJO8oxwX0KkUr+l/M=";
cargoHash = "sha256-d69jj2FGptjndJG1tq3Fb/8F3kuFXN5otsYGhXYhhZg=";
meta = with lib; {
description = "A Cargo subcommand to build and test all feature flag combinations";

View File

@ -1,35 +1,143 @@
GEM
remote: https://rubygems.org/
specs:
daemons (1.3.1)
eventmachine (1.0.9.1)
mail (2.7.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
chunky_png (1.4.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.2.2)
daemons (1.4.1)
date (3.3.3)
diff-lcs (1.5.0)
eventmachine (1.2.7)
execjs (2.8.1)
faye-websocket (0.11.3)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.15.5)
launchy (2.5.2)
addressable (~> 2.8)
mail (2.8.1)
mini_mime (>= 0.1.1)
mailcatcher (0.7.1)
eventmachine (= 1.0.9.1)
net-imap
net-pop
net-smtp
mailcatcher (0.9.0)
eventmachine (= 1.2.7)
faye-websocket (~> 0.11.1)
mail (~> 2.3)
net-smtp
rack (~> 1.5)
sinatra (~> 1.2)
skinny (~> 0.2.3)
sqlite3 (~> 1.3)
thin (~> 1.5.0)
mini_mime (1.0.1)
rack (1.6.11)
thin (~> 1.8)
matrix (0.4.2)
mini_mime (1.1.2)
mini_portile2 (2.8.4)
multi_json (1.15.0)
net-imap (0.3.7)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
nokogiri (1.15.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
psych (5.1.0)
stringio
public_suffix (5.0.3)
racc (1.7.1)
rack (1.6.13)
rack-protection (1.5.5)
rack
rack-test (2.1.0)
rack (>= 1.3)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.5.0)
psych (>= 4.0.0)
regexp_parser (2.8.1)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubyzip (2.3.2)
sass (3.4.25)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
skinny (0.2.4)
eventmachine (~> 1.0.0)
thin (>= 1.5, < 1.7)
sqlite3 (1.4.0)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (2.0.9)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-helpers (1.4.0)
sprockets (>= 2.2)
sprockets-sass (2.0.0.beta2)
sprockets (>= 2.0, < 4.0)
sqlite3 (1.6.3)
mini_portile2 (~> 2.8.0)
stringio (3.0.7)
thin (1.8.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
tilt (2.2.0)
timeout (0.4.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
websocket (1.2.9)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
PLATFORMS
ruby

View File

@ -1,9 +1,10 @@
{ lib, bundlerApp, bundlerUpdateScript }:
{ pkgs, lib, bundlerApp, bundlerUpdateScript }:
bundlerApp {
pname = "mailcatcher";
gemdir = ./.;
exes = [ "mailcatcher" "catchmail" ];
ruby = pkgs.ruby_3_0;
passthru.updateScript = bundlerUpdateScript "mailcatcher";

View File

@ -1,65 +1,350 @@
{
addressable = {
dependencies = ["public_suffix"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
type = "gem";
};
version = "2.8.4";
};
capybara = {
dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n";
type = "gem";
};
version = "3.39.2";
};
capybara-screenshot = {
dependencies = ["capybara" "launchy"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1";
type = "gem";
};
version = "1.0.26";
};
chunky_png = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9";
type = "gem";
};
version = "1.4.0";
};
coffee-script = {
dependencies = ["coffee-script-source" "execjs"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
type = "gem";
};
version = "2.4.1";
};
coffee-script-source = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1";
type = "gem";
};
version = "1.12.2";
};
compass = {
dependencies = ["chunky_png" "compass-core" "compass-import-once" "rb-fsevent" "rb-inotify" "sass"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c";
type = "gem";
};
version = "1.0.3";
};
compass-core = {
dependencies = ["multi_json" "sass"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a";
type = "gem";
};
version = "1.0.3";
};
compass-import-once = {
dependencies = ["sass"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq";
type = "gem";
};
version = "1.0.5";
};
concurrent-ruby = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
version = "1.2.2";
};
daemons = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg";
type = "gem";
};
version = "1.3.1";
version = "1.4.1";
};
date = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
type = "gem";
};
version = "3.3.3";
};
diff-lcs = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
type = "gem";
};
version = "1.5.0";
};
eventmachine = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z";
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.0.9.1";
version = "1.2.7";
};
execjs = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd";
type = "gem";
};
version = "2.8.1";
};
faye-websocket = {
dependencies = ["eventmachine" "websocket-driver"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01xkpv5b4fjc5n6n1fq6z1ris991av2fbadvs8r71i9r34b8g48h";
type = "gem";
};
version = "0.11.3";
};
ffi = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
version = "1.15.5";
};
launchy = {
dependencies = ["addressable"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a";
type = "gem";
};
version = "2.5.2";
};
mail = {
dependencies = ["mini_mime"];
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
type = "gem";
};
version = "2.7.1";
version = "2.8.1";
};
mailcatcher = {
dependencies = ["eventmachine" "mail" "rack" "sinatra" "skinny" "sqlite3" "thin"];
dependencies = ["eventmachine" "faye-websocket" "mail" "net-smtp" "rack" "sinatra" "sqlite3" "thin"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02w1ycyfv7x0sh9799lz7xa65p5qvl5z4pa8a7prb68h2zwkfq0n";
sha256 = "003d2a6i97syw67jxrjq0p4xm19p9cfqnbmsg4b1c3mdb5c78rfz";
type = "gem";
};
version = "0.7.1";
version = "0.9.0";
};
matrix = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
type = "gem";
};
version = "0.4.2";
};
mini_mime = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
type = "gem";
};
version = "1.1.2";
};
mini_portile2 = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq";
type = "gem";
};
version = "2.8.4";
};
multi_json = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "1.15.0";
};
net-imap = {
dependencies = ["date" "net-protocol"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3";
type = "gem";
};
version = "1.0.1";
version = "0.3.7";
};
net-pop = {
dependencies = ["net-protocol"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4";
type = "gem";
};
version = "0.1.2";
};
net-protocol = {
dependencies = ["timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
type = "gem";
};
version = "0.2.1";
};
net-smtp = {
dependencies = ["net-protocol"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
type = "gem";
};
version = "0.3.3";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7";
type = "gem";
};
version = "1.15.3";
};
psych = {
dependencies = ["stringio"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1msambb54r3d1sg6smyj4k2pj9h9lz8jq4jamip7ivcyv32a85vz";
type = "gem";
};
version = "5.1.0";
};
public_suffix = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k";
type = "gem";
};
version = "5.0.3";
};
racc = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
type = "gem";
};
version = "1.7.1";
};
rack = {
groups = ["default"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
type = "gem";
};
version = "1.6.11";
version = "1.6.13";
};
rack-protection = {
dependencies = ["rack"];
@ -72,6 +357,164 @@
};
version = "1.5.5";
};
rack-test = {
dependencies = ["rack"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c";
type = "gem";
};
version = "2.1.0";
};
rake = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
version = "13.0.6";
};
rb-fsevent = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
type = "gem";
};
version = "0.11.2";
};
rb-inotify = {
dependencies = ["ffi"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
type = "gem";
};
version = "0.10.1";
};
rdoc = {
dependencies = ["psych"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05r2cxscapr9saqjw8dlp89as7jvc2mlz1h5kssrmkbz105qmfcm";
type = "gem";
};
version = "6.5.0";
};
regexp_parser = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3";
type = "gem";
};
version = "2.8.1";
};
rexml = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
type = "gem";
};
version = "3.2.6";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
type = "gem";
};
version = "3.12.0";
};
rspec-core = {
dependencies = ["rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
type = "gem";
};
version = "3.12.2";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
type = "gem";
};
version = "3.12.3";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy";
type = "gem";
};
version = "3.12.6";
};
rspec-support = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
type = "gem";
};
version = "3.12.1";
};
rubyzip = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
type = "gem";
};
version = "2.3.2";
};
sass = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kfpcwh8dgw4lc81qglkvjl73689jy3g7196zkxm4fpskg1p5lkw";
type = "gem";
};
version = "3.4.25";
};
selenium-webdriver = {
dependencies = ["rexml" "rubyzip" "websocket"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg";
type = "gem";
};
version = "4.9.0";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
groups = ["default"];
@ -83,46 +526,142 @@
};
version = "1.4.8";
};
skinny = {
dependencies = ["eventmachine" "thin"];
groups = ["default"];
sprockets = {
dependencies = ["concurrent-ruby" "rack"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9";
sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
type = "gem";
};
version = "0.2.4";
version = "3.7.2";
};
sqlite3 = {
groups = ["default"];
sprockets-helpers = {
dependencies = ["sprockets"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pmgpqx2sg8pms54rk7kjjy8jwsw21g1f7mb02fggbdcqy8jk3fx";
sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij";
type = "gem";
};
version = "1.4.0";
};
sprockets-sass = {
dependencies = ["sprockets"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02g153dhzmrlik5dd9kyq0rvr2xjm3fwx8rm7apqfrykc47aizqr";
type = "gem";
};
version = "2.0.0.beta2";
};
sqlite3 = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37";
type = "gem";
};
version = "1.6.3";
};
stringio = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0557v4z7996cgqw7i9197848mymv02krads93dn9lyqa5d7xd0dn";
type = "gem";
};
version = "3.0.7";
};
thin = {
dependencies = ["daemons" "eventmachine" "rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga";
sha256 = "08g1yq6zzvgndj8fd98ah7pp8g2diw28p8bfjgv7rvjvp8d2am8w";
type = "gem";
};
version = "1.5.1";
version = "1.8.2";
};
tilt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7";
type = "gem";
};
version = "2.0.9";
version = "2.2.0";
};
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd";
type = "gem";
};
version = "0.4.0";
};
uglifier = {
dependencies = ["execjs"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f";
type = "gem";
};
version = "4.2.0";
};
websocket = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8";
type = "gem";
};
version = "1.2.9";
};
websocket-driver = {
dependencies = ["websocket-extensions"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n";
type = "gem";
};
version = "0.7.6";
};
websocket-extensions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw";
type = "gem";
};
version = "0.1.5";
};
xpath = {
dependencies = ["nokogiri"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd";
type = "gem";
};
version = "3.2.0";
};
}

View File

@ -70,19 +70,19 @@ let
#
# To compute the commit when upgrading this derivation, do:
# `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src`
# Example: `$ git rev-parse v4.14.1`
commit = "e37b35278d4b529fd774469c3e1807ec8f4d1eb0";
# Example: `$ git rev-parse v4.16.1`
commit = "94ef3776ad7bebfb5780dfc9632e04d20d5c9a6c";
in
stdenv.mkDerivation (finalAttrs: {
pname = "code-server";
version = "4.16.0";
version = "4.16.1";
src = fetchFromGitHub {
owner = "coder";
repo = "code-server";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-oGtYrCW9ZweWEkx7uQkQCQx53QoyV5Y3BMsvApGiY9Y=";
hash = "sha256-h4AooHHKV/EfN2S1z7CQKqnYW3uA3sKhSW4senlzjxI=";
};
yarnCache = stdenv.mkDerivation {

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "10.0.2";
version = "10.0.3";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
hash = "sha256-Db2j6D2Ds75qDUawOSe5jhtePrbxGq7nWnFooWa2vTI=";
hash = "sha256-2LHCG2x4SJzUgBfYZFQCTlrUGule9j+1x3R1vDmBlAs=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
hash = "sha256-Mkn9KhyJmOKCuO3gDL+mgKijvResB/4mRAff6grOpuo=";
hash = "sha256-2ut+7hMnttQHzarxojTsnY4q5abQheD9PYxgYhTrYDI=";
};
vendorHash = "sha256-hN4hHJhjlCdQUvxYKHItez9H7/WqCK5Nlog5INO4m/g=";
vendorHash = "sha256-VMy7RGp5F5cc1nBpt5Fm1LbY6IK1/JHLEEGIoYzUvdw=";
nativeBuildInputs = [ wire ];

View File

@ -31,10 +31,10 @@
}:
let
version = "2.45.0";
version = "2.46.0";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
hash = "sha256-xfIxq1cFkLjSxjPPdCjgv+FOvbUGdeZpRecbSIFUAXo=";
hash = "sha256-H6RRyemawt9NRLTVG0iH4vNFNiuvdPZz7u43Zop0vVI=";
};
in
buildGoModule rec {
@ -47,10 +47,10 @@ buildGoModule rec {
owner = "prometheus";
repo = "prometheus";
rev = "v${version}";
hash = "sha256-smc51YrWW8jPzmIkOi0kKaAGUS3TUXpzGDLyslhRVUE=";
hash = "sha256-TB4N5aAfNw34HJ1HSt6rHTETTyAgpGA8B5VOFHisZFU=";
};
vendorHash = "sha256-W958ODhmRL4GAM6hZd71BgEmrwrzR2XHoDrc+rBo4TI=";
vendorHash = "sha256-jeGtna7IeKAOiu4FFA2xRv+fwpzCpnqwI5nj641dlM4=";
excludedPackages = [ "documentation/prometheus-mixin" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "copilot-cli";
version = "1.28.0";
version = "1.29.0";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KrgPHdYR0kYwyNhO2EwIO00Xnjy0MmrzHb5LDmbrgB0=";
sha256 = "sha256-sXYdP1HvwamKKvCNM5T2vu86y5mQ9MD44SrFgqWfQkE=";
};
vendorHash = "sha256-1YOx7tqPJwCZlJSAG9o+STKRAIR72dptvTOpa9rRt3A=";
vendorHash = "sha256-TbgxXkLIEu7jSnngVRbp4E22GgOkXSB0b8JzHI/pNGk=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.61.0";
version = "0.63.0";
src = fetchFromGitHub {
owner = "Qovery";
repo = pname;
rev = "v${version}";
hash = "sha256-V3tKUIpSO1oGpkHjkFWAtBoe91va6q2HInZsHrjWhQ0=";
rev = "refs/tagsv${version}";
hash = "sha256-2w8z6/piPXJ4tGdO1IrzjLcCDGF/C8/Mln+XWu4U2+0=";
};
vendorHash = "sha256-5ikOmjJ2E+Kk8FAl6/Jm+k5HKlZJ1Ik3uZ/2sD5Eqok=";
vendorHash = "sha256-UicCXaKA2xmkcYCz4RNN4kG2Rj0OIrN+IL3UJF97oIo=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -1,18 +1,18 @@
From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001
From 72f7d8abee34107b815e49540f2fad7f1ab0b2cc Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Thu, 25 Feb 2021 09:20:51 +0100
Subject: [PATCH] Skip testing restore with permission failure
The test fails in sandboxed builds.
---
cmd/restic/integration_test.go | 1 +
cmd/restic/cmd_restore_integration_test.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go
index 7d198d33..1588ccb1 100644
--- a/cmd/restic/integration_test.go
+++ b/cmd/restic/integration_test.go
@@ -1170,6 +1170,7 @@ func TestRestoreLatest(t *testing.T) {
diff --git a/cmd/restic/cmd_restore_integration_test.go b/cmd/restic/cmd_restore_integration_test.go
index 2c7cbe1fb..f25f13754 100644
--- a/cmd/restic/cmd_restore_integration_test.go
+++ b/cmd/restic/cmd_restore_integration_test.go
@@ -200,6 +200,7 @@ func TestRestoreLatest(t *testing.T) {
}
func TestRestoreWithPermissionFailure(t *testing.T) {
@ -21,5 +21,5 @@ index 7d198d33..1588ccb1 100644
defer cleanup()
--
2.29.2
2.41.0

View File

@ -3,13 +3,13 @@
buildGoModule rec {
pname = "restic";
version = "0.15.2";
version = "0.16.0";
src = fetchFromGitHub {
owner = "restic";
repo = "restic";
rev = "v${version}";
hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q=";
hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8=";
};
patches = [
@ -17,7 +17,7 @@ buildGoModule rec {
./0001-Skip-testing-restore-with-permission-failure.patch
];
vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM=";
vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY=";
subPackages = [ "cmd/restic" ];
@ -26,7 +26,7 @@ buildGoModule rec {
passthru.tests.restic = nixosTests.restic;
postPatch = ''
rm cmd/restic/integration_fuse_test.go
rm cmd/restic/cmd_mount_integration_test.go
'';
postInstall = ''

View File

@ -5,16 +5,22 @@
python3.pkgs.buildPythonApplication rec {
pname = "dnsrecon";
version = "1.1.4";
version = "1.1.5";
format = "setuptools";
src = fetchFromGitHub {
owner = "darkoperator";
repo = pname;
rev = version;
hash = "sha256-DtyYYNtv0Zk8103NN+vlnr3Etv0bAZ6+A2CXeZZgiUg=";
hash = "sha256-W7ZFc+kF00ANoYVTlsY+lJ9FjMEGbqYfNojoZFiRHU8=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "flake8" "" \
--replace "pytest" ""
'';
propagatedBuildInputs = with python3.pkgs; [
dnspython
netaddr

View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.26"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.27"

View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: dd1f90dd6fd267d8430d8e0299ebcfe6a85327cf
ref: refs/tags/6.3.26
revision: 53af96320f2fddfc0189ea66fd9db1f87d94eb06
ref: refs/tags/6.3.27
specs:
metasploit-framework (6.3.26)
metasploit-framework (6.3.27)
actionpack (~> 7.0)
activerecord (~> 7.0)
activesupport (~> 7.0)
@ -131,13 +131,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.790.0)
aws-sdk-core (3.178.0)
aws-partitions (1.795.0)
aws-sdk-core (3.180.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.392.0)
aws-sdk-ec2 (1.395.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.86.0)
@ -146,8 +146,8 @@ GEM
aws-sdk-kms (1.71.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.131.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sdk-s3 (1.132.0)
aws-sdk-core (~> 3, >= 3.179.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sdk-ssm (1.156.0)
@ -190,7 +190,7 @@ GEM
faraday-net_http (3.0.2)
faraday-retry (2.2.0)
faraday (~> 2.0)
faye-websocket (0.11.2)
faye-websocket (0.11.3)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.15.5)
@ -259,7 +259,7 @@ GEM
metasploit_payloads-mettle (1.0.20)
method_source (1.0.0)
mini_portile2 (2.8.4)
minitest (5.18.1)
minitest (5.19.0)
mqtt (0.6.0)
msgpack (1.6.1)
multi_json (1.15.0)
@ -271,7 +271,7 @@ GEM
timeout
net-smtp (0.3.3)
net-protocol
net-ssh (7.1.0)
net-ssh (7.2.0)
network_interface (0.0.2)
nexpose (7.3.0)
nio4r (2.5.9)
@ -300,7 +300,7 @@ GEM
puma (6.3.0)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.7)
rack (2.2.8)
rack-protection (3.0.6)
rack
rack-test (2.1.0)
@ -326,7 +326,7 @@ GEM
recog (3.1.1)
nokogiri
redcarpet (3.6.0)
reline (0.3.6)
reline (0.3.7)
io-console (~> 0.5)
rex-arch (0.1.14)
rex-text
@ -376,9 +376,9 @@ GEM
rex-text (0.2.52)
rex-zip (0.1.4)
rex-text
rexml (3.2.5)
rexml (3.2.6)
rkelly-remix (0.0.7)
ruby-macho (3.0.0)
ruby-macho (4.0.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
ruby_smb (3.2.5)
@ -423,7 +423,7 @@ GEM
warden (1.2.9)
rack (>= 2.0.9)
webrick (1.8.1)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
win32api (0.1.0)
@ -442,7 +442,7 @@ GEM
activesupport (>= 4.2, < 8.0)
xmlrpc (0.3.2)
webrick
zeitwerk (2.6.8)
zeitwerk (2.6.10)
PLATFORMS
ruby

View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.3.26";
version = "6.3.27";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-GSf+GE4LeZxmhTskiwWjWf9rc6K4wg357MuK5cbLuMs=";
sha256 = "sha256-3iNzOLOASz78ZUoShKMH/AYZE+UTu31qU/VjXP677cc=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -104,30 +104,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mjzb10zyx78hnnz6j4bjv3awpgajfi0nmavrhy9x1qsf7yc9bjd";
sha256 = "07nz6pdzhrfzyhcnd0slikbw0xpslisis2ab57v83fbmn3rkpwn4";
type = "gem";
};
version = "1.790.0";
version = "1.795.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jv5h7n0vkyjq0v3xqad5xhrl4ijnh214zq3xg4ghvsk6ah8a90r";
sha256 = "1a820i7b3fcpnk0966sp7sdj9mzkazfwjflrd1f3i9qgbabf5li3";
type = "gem";
};
version = "3.178.0";
version = "3.180.1";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15vb0gn23xig6alcxh487r0jl5cdxm45b6zihh3wscvfzwqq0n5n";
sha256 = "01ds6pw1q87mqbyv7v0a444lsifrv6y0sqcw3v5yrng2ap43xby7";
type = "gem";
};
version = "1.392.0";
version = "1.395.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -154,10 +154,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1855m1v6lh9rji543nvk0fjn98ma0q2978zc4f5y76qsibl7fg6c";
sha256 = "0cjb40w8hw4h59bbjidp6hlb1j6akb36d8s5a37vlm6zwq327i7f";
type = "gem";
};
version = "1.131.0";
version = "1.132.0";
};
aws-sdk-ssm = {
groups = ["default"];
@ -404,10 +404,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p4hsz3v75lxyj3ymwjm7pxrrk1997n54lfm51h5laakzxbji421";
sha256 = "01xkpv5b4fjc5n6n1fq6z1ris991av2fbadvs8r71i9r34b8g48h";
type = "gem";
};
version = "0.11.2";
version = "0.11.3";
};
ffi = {
groups = ["default"];
@ -634,12 +634,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "dd1f90dd6fd267d8430d8e0299ebcfe6a85327cf";
sha256 = "1jxqrg3fb2nbxkwhvhmql9rnpzsrlc2qn91vhmk9qy8b9qcgw9qr";
rev = "53af96320f2fddfc0189ea66fd9db1f87d94eb06";
sha256 = "1izdpgz5qqzmadm7vfqkwl9ij1pw0yiq84jacpy3wjw0ncw768yy";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.3.26";
version = "6.3.27";
};
metasploit-model = {
groups = ["default"];
@ -706,10 +706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6";
type = "gem";
};
version = "5.18.1";
version = "5.19.0";
};
mqtt = {
groups = ["default"];
@ -796,10 +796,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a";
type = "gem";
};
version = "7.1.0";
version = "7.2.0";
};
network_interface = {
groups = ["default"];
@ -977,10 +977,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv";
type = "gem";
};
version = "2.2.7";
version = "2.2.8";
};
rack-protection = {
groups = ["default"];
@ -1087,10 +1087,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rgsfxm3sb9mgsxa7gks40wy4sb41w33j30y6izmih70ss34x4dh";
sha256 = "1n6b6a1b18fscw9ff0fw5jk1l7kzw542r8444mm7d27zyx5v18sj";
type = "gem";
};
version = "0.3.6";
version = "0.3.7";
};
rex-arch = {
groups = ["default"];
@ -1277,10 +1277,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
type = "gem";
};
version = "3.2.5";
version = "3.2.6";
};
rkelly-remix = {
groups = ["default"];
@ -1297,10 +1297,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sg0kzqrldx9mlpvymif3dcgz8j8q1nc8jaszrd03nfh5bvp3fd5";
sha256 = "1yf8fq0l5hlqkjklcpxmg6vhzvbyigwd2n441aq42b2wa2f8xj5q";
type = "gem";
};
version = "3.0.0";
version = "4.0.0";
};
ruby-rc4 = {
groups = ["default"];
@ -1548,10 +1548,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052";
sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n";
type = "gem";
};
version = "0.7.5";
version = "0.7.6";
};
websocket-extensions = {
groups = ["default"];
@ -1618,9 +1618,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk";
sha256 = "06vf6y5ai20ry3b1h9cl7vsdj6i5valq172zdxpnfhj5zvlp104j";
type = "gem";
};
version = "2.6.8";
version = "2.6.10";
};
}

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "terrascan";
version = "1.18.1";
version = "1.18.2";
src = fetchFromGitHub {
owner = "accurics";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-w0ZOkPw8Y6Z1hyZecZfjd/YrTP8v6S0jNhgNzLjMRrY=";
hash = "sha256-ZWkuzblPIvYcOllmIjk2RQZdkcPYZLGOuxwgX3NMydg=";
};
vendorHash = "sha256-0WkOIgIA1fKn2SeS5QFeLGCGMstdlkU+eDRUVAs3ETA=";
vendorHash = "sha256-e09F4dA/uT50Cted3HqE08d04+l0V6U95AdKGKBFDpI=";
# Tests want to download a vulnerable Terraform project
doCheck = false;

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.45.1";
version = "3.45.3";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-kWEDeFx3ngpL6ySCD5GsJbmtbhv1qCMt9yjrskLmbbg=";
hash = "sha256-ZjoX1E9zusni8ZRaTiaj41wpVP+f7r5PcsgPAnzZF/s=";
};
vendorHash = "sha256-dg29rK5/se2DVhc+GLFeFzh3bqJl3dfC2zjGLX7utDs=";
vendorHash = "sha256-VaNNfdY2CXR0sJb9efxTwkm12l20SbO5Q3OvcBs4cKA=";
ldflags = [
"-s"

View File

@ -0,0 +1,25 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
}:
buildNpmPackage rec {
pname = "zx";
version = "7.2.3";
src = fetchFromGitHub {
owner = "google";
repo = "zx";
rev = version;
hash = "sha256-YMfecNazmL8J+f80FdIRvr2upQ7VgXSkQQnm8z0Swhw=";
};
npmDepsHash = "sha256-ywNd2LGjM35ecW4dnj0oNwdSX2CRy8i9OGKPIdI0UEQ=";
meta = {
description = "Tool for writing scripts using JavaScript";
homepage = "https://github.com/google/zx";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ hlolli ];
};
}

View File

@ -30797,7 +30797,7 @@ with pkgs;
dnglab = callPackage ../tools/graphics/dnglab { };
inherit (callPackage ../applications/virtualization/docker {})
docker_20_10;
docker_20_10 docker_24;
docker = docker_20_10;
docker-client = docker.override { clientOnly = true; };
@ -36527,7 +36527,7 @@ with pkgs;
zsteg = callPackage ../tools/security/zsteg { };
inherit (nodePackages) zx;
zx = callPackage ../tools/system/zx { };
zxfer = callPackage ../applications/system/zxfer { };