Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-06-14 12:01:40 +00:00 committed by GitHub
commit bcf52f9343
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
37 changed files with 342 additions and 187 deletions

View File

@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings
#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nix nix.perl-bindings
# This command uploads tarballs to tarballs.nixos.org, the
# content-addressed cache used by fetchurl as a fallback for when

View File

@ -56,6 +56,7 @@ in
services.displayManager.sessionPackages = [ cfg.package ];
xdg.portal = {
enable = true;
extraPortals = [ cfg.portalPackage ];
configPackages = lib.mkDefault [ cfg.package ];
};
@ -70,7 +71,7 @@ in
(import ./wayland-session.nix {
inherit lib pkgs;
enableXWayland = cfg.xwayland.enable;
enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed
enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
})
]);

View File

@ -6,19 +6,19 @@
buildGoModule rec {
pname = "optimism";
version = "1.7.6";
version = "1.7.7";
src = fetchFromGitHub {
owner = "ethereum-optimism";
repo = "optimism";
rev = "op-node/v${version}";
hash = "sha256-LpkmNJqPe73qbTNvqxlDDTh9hD/H39ll3Rn2NEFEcg8=";
hash = "sha256-KN6Y8YhYGNGg/t4t599RAo6mF7Wn7GaSnrLEk3WLekc=";
fetchSubmodules = true;
};
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
vendorHash = "sha256-2eVwGWw/z6ct3PA8fC0rBwkNaICd20llVE/9essF95Q=";
vendorHash = "sha256-MWGjRj5SMFi3O86l3Gc/oavzWd1TtoKr53eEXbCOamQ=";
buildInputs = [
libpcap

View File

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "2.0.8";
version = "2.0.8.1";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "sha256-9iNaEvTHvmE4DEh/5jHEOJuTnr2yAZSRR/L/v0ZUZDk=";
sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w=";
};
dontBuild = true;

View File

@ -5,13 +5,13 @@ trivialBuild {
version = "1.11";
src = fetchurl {
url = "http://bigwalter.net/daniel/elisp/sv-kalender.el";
url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/ec4fa36bdba5d2c5c4f5e0400a70768c10e969e8/sv-kalender.el";
sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m";
};
meta = with lib; {
description = "Swedish calendar for Emacs";
homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el";
homepage = "https://www.emacswiki.org/emacs/sv-kalender.el";
platforms = platforms.all;
license = licenses.gpl3Plus;
maintainers = [ maintainers.rycee ];

View File

@ -17469,4 +17469,17 @@ final: prev:
};
git-prompt-string-lualine-nvim = buildVimPlugin {
pname = "git-prompt-string-lualine-nvim";
version = "2024-04-22";
src = fetchFromGitHub {
owner = "mikesmithgh";
repo = "git-prompt-string-lualine.nvim";
rev = "5426ce15462abe4faf5cd76db7476b2686120fe9";
sha256 = "sha256-BM1AEpIcOd5nr4N/ZoxK9NodiUbUuY9hw7n/wRTXzzk=";
};
meta.homepage = "https://github.com/mikesmithgh/git-prompt-string-lualine.nvim";
};
}

View File

@ -347,6 +347,7 @@ https://github.com/lambdalisue/gina.vim/,,
https://github.com/f-person/git-blame.nvim/,,
https://github.com/akinsho/git-conflict.nvim/,HEAD,
https://github.com/rhysd/git-messenger.vim/,,
https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD,
https://github.com/ThePrimeagen/git-worktree.nvim/,,
https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
https://github.com/vim-scripts/gitignore.vim/,,

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "apitrace";
version = "11.1";
version = "12.0";
src = fetchFromGitHub {
owner = "apitrace";
repo = "apitrace";
rev = version;
hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0=";
hash = "sha256-Y2ceE0F7q5tP64Mtvkc7JHOZQN30MDVCPHfiWDnfTSQ=";
fetchSubmodules = true;
};

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "werf";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-kHNjdwAIGJi1/ryEioRwZIYm4UziT2Ig1y2PgnbA0ZE=";
hash = "sha256-dZwZzBisQUmOz1lij6L0NHigXW2DtUd6s86sHYq8UPA=";
};
vendorHash = "sha256-cWOnIEvVer+USqNQJmhZ7pYSJfzY2xjq2oTxRd/y94w=";

View File

@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.27.7";
version = "1.27.8";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
hash = "sha256-Y/gwQfb3ShOsXsNLomtqUlmYaw7FQQ6IUN1fHSYOouQ=";
hash = "sha256-+uyN/x/nFB/YAOvIqO1IIs3UH+yn/eKMBW1Ap9PvhRM=";
};
vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E=";
vendorHash = "sha256-fzNpdriCRr4M3oW8IaImnGEN4G9AQwLZNFHg00zbIs0=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when

View File

@ -1,7 +1,6 @@
{ buildPythonPackage
, lib
, fetchFromGitLab
, fetchpatch
, pyenchant
, scikit-learn
, pypillowfight
@ -34,13 +33,6 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/paperwork-backend";
patches = [
# fixes building with recent scipy
# remove on next release
(fetchpatch {
url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch";
hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg=";
})
# disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700
./flaky_test.patch
];

View File

@ -1,13 +1,13 @@
{fetchFromGitLab}:
rec {
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
repo = "paperwork";
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "sha256-fVw+W10yEPLf6IUyaDpnmu7tPOqbvNLE8IK8mjHvurQ=";
sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI=";
};
sample_documents = fetchFromGitLab {
domain = "gitlab.gnome.org";

View File

@ -18,12 +18,15 @@ python3.pkgs.buildPythonApplication rec {
# All requirements are pinned
pythonRelaxDeps = true;
nativeBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [
poetry-core
];
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
neo4j
numpy
pytz

View File

@ -0,0 +1,40 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "breads-ad";
version = "1.2.4-unstable-2024-05-27";
pyproject = true;
src = fetchFromGitHub {
owner = "oppsec";
repo = "breads";
rev = "bdfc8b5f0357a34847767505ddc98734ca3b491f";
hash = "sha256-U1q15D59N55qBf4NVOpe5RpQjlE1ye2TNNIZf2IZV3U=";
};
build-system = with python3.pkgs; [
setuptools
];
dependencies = with python3.pkgs; [
impacket
ldap3
rich
];
# Project has no tests
doCheck = false;
meta = with lib; {
description = "Tool to evaluate Active Directory Security";
homepage = "https://github.com/oppsec/breads";
changelog = "https://github.com/oppsec/breads/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "breads-ad";
};
}

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cdecl";
version = "16.4.1";
version = "17.0";
src = fetchFromGitHub {
owner = "paul-j-lucas";
repo = "cdecl";
rev = "refs/tags/cdecl-${finalAttrs.version}";
hash = "sha256-QAU/wTVBcSgIuY+fdZUaWGBNGuAvu/xyXuzQUtmn510=";
hash = "sha256-ElMmsFD4VXF6BFjFuuWmgFJaqCPCxpQB7S9tLkeGmMY=";
};
strictDeps = true;

View File

@ -13,10 +13,10 @@ let
}.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-7GOWEvCco8/CxdWmvRsXfMOOSPsfb1/UQpbFEEeQfUc=";
aarch64-linux = "sha256-j+gILUP681hMo0azcbeZwi3Q9dwd9v6ADWow720cWAo=";
x86_64-darwin = "sha256-RNDDzAwf5s2EMTrum1OF6iZ/SUF7cG0Ow2itb0ynaJk=";
aarch64-darwin = "sha256-ac8j5BFEylAe7ApN3+iYW5ldFUh/7UYWf3MlDNOQTvc=";
x86_64-linux = "sha256-38ESKfQXHqHdP+vu/ynCByIPYHcvt8w8SJ/NTmCpm8o=";
aarch64-linux = "sha256-W00MyiBPQa8vClIjDynDgYEeigjWtBuDfNzZKMEzifg=";
x86_64-darwin = "sha256-CkKuEuYfq/vUv8uc4mhKpjqAfGM/B8goJ5EPAsA1gnI=";
aarch64-darwin = "sha256-aX70EfrRzEz2DJIcSEXrd0T0ptHzie21CQx4g6dU7g0=";
}.${system} or throwSystem;
bin = "$out/bin/codeium_language_server";
@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "codeium";
version = "1.8.57";
version = "1.8.61";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

View File

@ -0,0 +1,42 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "conpass";
version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "login-securite";
repo = "conpass";
rev = "refs/tags/v${version}";
hash = "sha256-7o4aQ6qpaWimWqgFO35Wht7mQsdVezoPTm7hp54FWR8=";
};
build-system = with python3.pkgs; [
setuptools
];
dependencies = with python3.pkgs; [
impacket
python-ldap
rich
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "conpass" ];
meta = with lib; {
description = "Continuous password spraying tool";
homepage = "https://github.com/login-securite/conpass";
changelog = "https://github.com/login-securite/conpass/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "conpass";
};
}

View File

@ -24,7 +24,6 @@
, openvr
, stb
, wlroots
, libliftoff
, libdecor
, libdisplay-info
, lib
@ -55,9 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
# Unvendor dependencies
./use-pkgconfig.patch
# Make it look for shaders in the right place
./shaders-path.patch
];
@ -116,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
libavif
libdrm
libei
libliftoff
SDL2
libdecor
libinput

View File

@ -1,9 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,6 @@ project(
default_options: [
'cpp_std=c++20',
'warning_level=2',
- 'force_fallback_for=wlroots,libliftoff,vkroots',
],
)

View File

@ -0,0 +1,33 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "go-secdump";
version = "0.2.1";
src = fetchFromGitHub {
owner = "jfjallid";
repo = "go-secdump";
rev = "refs/tags/${version}";
hash = "sha256-mb44v79BH9wW8+b1Le0lyVtl5iHIEzGvgVzaf0zEG20=";
};
vendorHash = "sha256-xgvT+RnaTzkVql7js/Mb5vZM5BV+B3OJbCTfDWDmt7c=";
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "Tool to remotely dump secrets from the Windows registry";
homepage = "https://github.com/jfjallid/go-secdump";
changelog = "https://github.com/jfjallid/go-secdump/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "go-secdump";
};
}

View File

@ -31,13 +31,13 @@
let
pname = "ollama";
# don't forget to invalidate all hashes each update
version = "0.1.43";
version = "0.1.44";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
rev = "v${version}";
hash = "sha256-+WCyRZPm4EyLH68uXDUJEW76v6FXq2WS5fqt4momKDA=";
hash = "sha256-HM7xtVdhRwhsLEBLvCgjU1iwdaqowRdrxh/Z0BzTPn8=";
fetchSubmodules = true;
};

View File

@ -5,7 +5,7 @@
set -eu -o pipefail
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
curl -s https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]")
https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]")
old_version=$(nix-instantiate --eval -A plasticity.version | jq -e -r)
if [[ $version == "$old_version" ]]; then

View File

@ -0,0 +1,45 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "sploitscan";
version = "0.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "xaitax";
repo = "SploitScan";
rev = "refs/tags/v${version}";
hash = "sha256-l2nLqQoM5TuOezobipBV+s/nXTw37xhop/xpipLL1Bs=";
};
pythonRelaxDeps = [
"openai"
"requests"
];
build-system = with python3.pkgs; [
setuptools
];
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
dependencies = with python3.pkgs; [
jinja2
openai
requests
];
pythonImportsCheck = [ "sploitscan" ];
meta = with lib; {
description = "Cybersecurity utility designed to provide detailed information on vulnerabilities and associated exploits";
homepage = "https://github.com/xaitax/SploitScan";
changelog = "https://github.com/xaitax/SploitScan/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "sploitscan";
};
}

View File

@ -3,7 +3,7 @@
buildGoModule,
fetchFromGitHub,
}: let
version = "0.26.1";
version = "0.26.2";
in
buildGoModule {
pname = "step-cli";
@ -13,7 +13,7 @@ in
owner = "smallstep";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-BVxdgyQsfCwHw/zjP3AKNib3sRWoBpMlZ7vh71nso94=";
hash = "sha256-CrV6kWgq2ldeOh5G0SgO8+q0HC1l8RuTELT3YXLxClU=";
};
ldflags = [
@ -27,7 +27,7 @@ in
rm command/certificate/remote_test.go
'';
vendorHash = "sha256-Z6wrWkyAGi01gH7+v2+VkyqRNqDwLFVwXm/1FIMzURg=";
vendorHash = "sha256-pqwrjreysMLfVmzPE7Tj/hLdM1HO13UfmbMXvNgLd5Y=";
meta = {
description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

View File

@ -1,10 +1,10 @@
{
"darwin": {
"hash": "sha256-PWcsgYnq8dCyAPJPPWeWXi1HpEgpKBt8OS4VH7XcLFM=",
"version": "0.2024.06.04.08.02.stable_02"
"hash": "sha256-fUGCbOQXT22VGFpnmLxDLfEaNOk7hJq4BF1PU54swYg=",
"version": "0.2024.06.11.08.02.stable_01"
},
"linux": {
"hash": "sha256-65H9SVcsco282MA//URP6gBuFjDc3R5elL2oZ0ae4W4=",
"version": "0.2024.06.04.08.02.stable_02"
"hash": "sha256-5Ge6tNA4UnRfDhY7ki/3SIX3egkyWye9hHWEhObv/I8=",
"version": "0.2024.06.11.08.02.stable_01"
}
}

View File

@ -31,51 +31,52 @@ in
lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
stdenvNoCC.mkDerivation rec {
pname = "where-is-my-sddm-theme";
version = "1.9.1";
stdenvNoCC.mkDerivation
(finalAttrs: {
pname = "where-is-my-sddm-theme";
version = "1.9.2";
src = fetchFromGitHub {
owner = "stepanzubkov";
repo = pname;
rev = "v${version}";
hash = "sha256-o9SpzSmHygHix3BUaMQRwLvgy2BdDsBXmiLDU+9u/6Q=";
};
src = fetchFromGitHub {
owner = "stepanzubkov";
repo = "where-is-my-sddm-theme";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-7I8ucPuPPpUH/KyJoiwlfS7r4Bsh8ZnkHdOEED12TOQ=";
};
propagatedUserEnvPkgs =
[ ]
++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
++ lib.optional (lib.elem "qt6" variants) [
qt6.qt5compat
qt6.qtsvg
];
propagatedUserEnvPkgs =
[ ]
++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
++ lib.optionals (lib.elem "qt6" variants) [
qt6.qt5compat
qt6.qtsvg
];
installPhase =
''
mkdir -p $out/share/sddm/themes/
''
+ lib.optionalString (lib.elem "qt6" variants) (
installPhase =
''
cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/
mkdir -p $out/share/sddm/themes/
''
+ lib.optionalString (lib.isAttrs themeConfig) ''
ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user
''
)
+ lib.optionalString (lib.elem "qt5" variants) (
''
cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/
''
+ lib.optionalString (lib.isAttrs themeConfig) ''
ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user
''
);
+ lib.optionalString (lib.elem "qt6" variants) (
''
cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/
''
+ lib.optionalString (lib.isAttrs themeConfig) ''
ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user
''
)
+ lib.optionalString (lib.elem "qt5" variants) (
''
cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/
''
+ lib.optionalString (lib.isAttrs themeConfig) ''
ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user
''
);
meta = with lib; {
description = "Most minimalistic SDDM theme among all themes";
homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ name-snrl ];
};
}
meta = {
description = "Most minimalistic SDDM theme among all themes";
homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ name-snrl ];
};
})

View File

@ -19,13 +19,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ucx";
version = "1.16.0";
version = "1.17.0";
src = fetchFromGitHub {
owner = "openucx";
repo = "ucx";
rev = "v${version}";
sha256 = "sha256-dihWwGlQclfa2ke+1V5c6coqfFjjuMyI8QRzNdx33zQ=";
sha256 = "sha256-Qd3c51LeF04haZA4wK6loNZwX2a3ju+ljwdPYPoUKCQ=";
};
outputs = [ "out" "doc" "dev" ];

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.133";
version = "3.2.136";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-mi8MPp99WViVHtMb5f6XxHiUwQkRh0DvPGRtaCUlykE=";
hash = "sha256-YpzaIwrGNwlK0PgyOw3InOFKOddMFggM7JSC1H8mApQ=";
};
patches = [ ./flake8-compat-5.x.patch ];

View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, bash }:
let
version = "16.11.1";
version = "17.0.0";
in
buildGoModule rec {
inherit version;
@ -23,7 +23,7 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-ISL11AvKIy/tW/3MhVZ2/XT5RcaYj+x9rHKWAB/9TdU=";
sha256 = "sha256-u9yA9v2UojBTDElfZhi8k9D1of0vIj3c14ZFmwa+yj4=";
};
patches = [

View File

@ -23,35 +23,35 @@
},
"28": {
"hashes": {
"aarch64-darwin": "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d",
"aarch64-linux": "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512",
"armv7l-linux": "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff",
"headers": "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr",
"x86_64-darwin": "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66",
"x86_64-linux": "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a"
"aarch64-darwin": "c310ab098d8849c4aa05f05b1c8521031241a046e023a911f964fd1db31c64c9",
"aarch64-linux": "f77107266581a6b9880757876518df1c4bf6eeff5c193bb5de0a8f6c9902bd1f",
"armv7l-linux": "384d8b43f52b5350a438031ad12980418fc244b4b0aecfa5f7dcc3d6f103ebed",
"headers": "1d407g6yb81l9p0pbsidrsmnzkrwb4f2qb221kc9k2r7qdpf64px",
"x86_64-darwin": "6bc63916b7fe52de7559e7631fef5c93315a18ee90a0d3d08168c91414b09ecf",
"x86_64-linux": "20f6be493cbd6c9924206e744b1c490af1f97f4735451b9dc19f0d305366d546"
},
"version": "28.3.1"
"version": "28.3.3"
},
"29": {
"hashes": {
"aarch64-darwin": "c16d05f1231bb3c77da05ab236b454b3a2b6a642403be51e7c9b16cd2c421a19",
"aarch64-linux": "c3764d6c3799950e3418e8e5a5a5b2c41abe421dd8bcdebf054c7c85798d9860",
"armv7l-linux": "c5e92943ad78b4e41a32ae53c679e148ea2ae09f95f914b1834dbdbae578ba91",
"headers": "0macff2ir515szp2nd6jimnpg9ig87whhfi08h2hwaxp4xn9j5hn",
"x86_64-darwin": "8ed7924f77a5c43c137a57097c5c47c2e8e9a78197e18af11a767c98035c123e",
"x86_64-linux": "91e5eb374c2c85a07c2d4e99a89eb18515ff0169a49c3fa75289800e1225729e"
"aarch64-darwin": "e9934a8eaecaab05dcc572b47576cdba78491c144c19348c9c9e9524c8c5917b",
"aarch64-linux": "a5c2bc148d3f6c3ee2bd15289243a1b75093afde3753d0aa1125d2cb621f5b59",
"armv7l-linux": "a75e2487ea1a1b292fbc160618167c204f161c602780f2b997b75d6ef5bbe539",
"headers": "0z4n8c95z48n54d1fph2p2i6cb43gk202zg09vmv168ajpspi2rr",
"x86_64-darwin": "b875c884efe86eb2e1922781f55193d82520e923510f19af87a58dfe07d21562",
"x86_64-linux": "eb07a8137fde970450242c51e0c2f8ef6556f377a21c357584aa2632ee9e1d3f"
},
"version": "29.4.0"
"version": "29.4.2"
},
"30": {
"hashes": {
"aarch64-darwin": "9189d4a8d69175d94edafa4cb29a47389ebaff22c9baf0dd67a448e7a5240129",
"aarch64-linux": "37b520604e319f86f372cc1da8244b27d24708a4bdc1cc07a6f1d793f37e96c3",
"armv7l-linux": "6202a7ccde4ca344c01c124bd997bcfad06d475dd2e35bba70379cf2d93b5268",
"headers": "15nzay60m1v720243n3iizbcldn6ka9vcphh050pih8rnh74ds5p",
"x86_64-darwin": "7d9e81712a4b0ab209d03d0eef08ee9c4da1f5293fb169ff08766356a2e65fbb",
"x86_64-linux": "5a2bfd0f6a8703dd1b408675c9349732c4713b378d9ae0f64ea4661f6b5c7fd4"
"aarch64-darwin": "7497d7926a094d6e1bf34f70ef206c4f2d9df072b1f9fa8cd431f6ea4fab680c",
"aarch64-linux": "bdb3485cd87861bb1d99f6b417f979ac899974a4322191a648efc311af9f8c5c",
"armv7l-linux": "3941ab1f23576d8f55fdf525e40387f97c2c9809173a8a933402b62ec95a592f",
"headers": "1jz8grs7sjncg68s34hf7rhd830414avxs1xg5lng5n7wmwfiw8i",
"x86_64-darwin": "bdadef26dac934416b17fa2af6bcd55424eb8b1ceb5f6fae068dbd5fd8b0d357",
"x86_64-linux": "4d00e8cd5f37962dc8fbefe2941d89dcb1c180f1568bb32122c7eb40d21f39c4"
},
"version": "30.0.6"
"version": "30.1.1"
}
}

View File

@ -47,10 +47,10 @@
},
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-YTuHUvqbVVq3gwfDFOzlRIlmfnm74u3soHem1jCVVaA=",
"hash": "sha256-hyk8RsG2hIsAZRiJuYRF6HC+K7TyA76qiYsc2sH0Apw=",
"owner": "electron",
"repo": "electron",
"rev": "v29.4.0"
"rev": "v29.4.2"
},
"src/media/cdm/api": {
"fetcher": "fetchFromGitiles",
@ -902,10 +902,10 @@
"electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf",
"modules": "121",
"node": "20.9.0",
"version": "29.4.0"
"version": "29.4.2"
},
"30": {
"chrome": "124.0.6367.207",
"chrome": "124.0.6367.243",
"chromium": {
"deps": {
"gn": {
@ -915,15 +915,15 @@
"version": "2024-03-14"
}
},
"version": "124.0.6367.207"
"version": "124.0.6367.243"
},
"chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=",
"deps": {
"src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-mMc1mWre9XeeR4jPn30RxAXadjyqcyVyHDjSVrI5lpI=",
"hash": "sha256-YrAJnuNig6v87+eNnZ2W+PCzxjGe5CuymF6ul/v9SCk=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"rev": "124.0.6367.207",
"rev": "124.0.6367.243",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"src/chrome/test/data/perf/canvas_bench": {
@ -952,10 +952,10 @@
},
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-6f/6Deqysv8MubMjyxjiDM55DXG/9wTqBWW+zC+9OBE=",
"hash": "sha256-VWc9I5wpQYv13I1xgLQVqDg6IfXMinrzJmkMaIsEY90=",
"owner": "electron",
"repo": "electron",
"rev": "v30.0.6"
"rev": "v30.1.1"
},
"src/media/cdm/api": {
"fetcher": "fetchFromGitiles",
@ -977,8 +977,8 @@
},
"src/third_party/angle": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-zEDHotJ6OSQlgq3nkVMhLll4j5iYl5sA1JFv854EIdM=",
"rev": "c67f290ef0f0433acb766c024d28c6f59f48b909",
"hash": "sha256-MFXZ7gEO8vHFHtjzzLSgGlB9AKx+hndPfmwsE5XHGXo=",
"rev": "bda89e1f7c7195a9d03d037039c2dd5057563a59",
"url": "https://chromium.googlesource.com/angle/angle.git"
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
@ -1115,14 +1115,14 @@
},
"src/third_party/dawn": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-GUB25IUviLFxGI3UQJS/kf51BZBeoYFqbiaSTSY11qA=",
"rev": "394edde38c9323f7c910e3bdec9b7efc4ee39379",
"hash": "sha256-W0E0fhjAc5gdTgIsy+iOAFA7GPEFeMPPJEU5nnRUtbM=",
"rev": "e04b03f714994b7a747b5472da4ffae9e6e38938",
"url": "https://dawn.googlesource.com/dawn.git"
},
"src/third_party/dawn/third_party/dxc": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-wsQtYqH8gFsDmLTUA7SKvTYiGQWX7Vbcz1QtsAg/epY=",
"rev": "bd7aa97798735e1288d36de41dcda75e867550e4",
"hash": "sha256-bqzkbBbf1btIz84odYfC3c69m6kgssHy2+a9aR+EUaQ=",
"rev": "511cfef8e0509d172fbfa156be8a97ed2b42590b",
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
},
"src/third_party/dawn/third_party/dxheaders": {
@ -1181,10 +1181,10 @@
},
"src/third_party/electron_node": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-9/TPxYbnQPDpWf/Zti8bTh22e/uFRlzs7SCThfx/byQ=",
"hash": "sha256-15RUrS+zjp0nOveBnZB3bvEv36noZr2ergtNL7ky8iQ=",
"owner": "nodejs",
"repo": "node",
"rev": "v20.11.1"
"rev": "v20.14.0"
},
"src/third_party/emoji-segmenter/src": {
"fetcher": "fetchFromGitiles",
@ -1502,8 +1502,8 @@
},
"src/third_party/openscreen/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-wUKhF9sU1HAZvs4fQHxeFfxkpkhBp6nTljJrQ4lH7lA=",
"rev": "a3f9719bed95289c59771d4c4bcb85f5ecacac43",
"hash": "sha256-4Qd5nHJxIOY7ifPy6Xf0TgZK0TkZY48scOkJ25kMCjk=",
"rev": "90e48ecc4ed9feeba36f49065c738d620d6f0780",
"url": "https://chromium.googlesource.com/openscreen"
},
"src/third_party/openscreen/src/buildtools": {
@ -1526,8 +1526,8 @@
},
"src/third_party/pdfium": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-4CPHeZAJM756a2TIxs4ZX0D7j85deDIf/bTGow75m/U=",
"rev": "7b90b15a21cfdd3d74525616b5de04df94fa0583",
"hash": "sha256-/gSW4sd2AN4m3aIs9AojqsfrXeCNNrl7wFM54KeQVxw=",
"rev": "dcdd830ae4e1b14f85383d1baf84efee6bc853cc",
"url": "https://pdfium.googlesource.com/pdfium.git"
},
"src/third_party/perfetto": {
@ -1586,8 +1586,8 @@
},
"src/third_party/skia": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-8C8IMQjfJGeCXCXZyd/eSbDNsdcKI/Bul0m1wrqx1P8=",
"rev": "e2ea2eb3e0d37fff47968dfaaa337debb3b75b1e",
"hash": "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=",
"rev": "a747f7ea37db6ea3871816dbaf2eb41b5776c826",
"url": "https://skia.googlesource.com/skia.git"
},
"src/third_party/smhasher/src": {
@ -1811,14 +1811,14 @@
},
"src/v8": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-8/XD/LwnCXDiVWeZvZsgvmSWpfVLILlaTtqw87V0Pgk=",
"rev": "ac8da461a20281ff8c30507cbdd7e6fed39fd183",
"hash": "sha256-ME/O8CJASZ8Ql931EaTRM3+6lLzGx1us/cK9Dv7Bd+s=",
"rev": "cc9dc1eb196bc3cbeca92eeec62949b4ac7cd757",
"url": "https://chromium.googlesource.com/v8/v8.git"
}
},
"electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf",
"electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q",
"modules": "123",
"node": "20.11.1",
"version": "30.0.6"
"node": "20.14.0",
"version": "30.1.1"
}
}

View File

@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "protoc-gen-twirp";
version = "8.1.3";
@ -11,14 +11,16 @@ buildGoPackage rec {
sha256 = "sha256-p3gHVHGBHakOOQnJAuMK7vZumNXN15mOABuEHUG0wNs=";
};
goPackagePath = "github.com/twitchtv/twirp";
postPatch = ''
go mod init github.com/twitchtv/twirp
'';
vendorHash = null;
subPackages = [
"protoc-gen-twirp"
];
doCheck = true;
meta = with lib; {
description = "Simple RPC framework with protobuf service definitions";
mainProgram = "protoc-gen-twirp";

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "relic";
version = "7.6.2";
version = "8.0.1";
src = fetchFromGitHub {
owner = "sassoftware";
repo = pname;
rev = "v${version}";
sha256 = "sha256-T76+Ftky1rSIqEoKE3RLsf6g2gguVJgYFflWmyEhdEk=";
sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo=";
};
vendorHash = "sha256-5mgqIw3BV88rEF3ALD3pLhm658yUUFf44hQFSw085cU=";
vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY=";
ldflags = [
"-s"

View File

@ -6,18 +6,18 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
name = "r8168-${kernel.version}-${version}";
# on update please verify that the source matches the realtek version
version = "8.052.01";
version = "8.053.00";
# This is a mirror. The original website[1] doesn't allow non-interactive
# downloads, instead emailing you a download link.
# [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
# I've verified manually (`diff -r`) that the source code for version 8.052.01
# [1] https://www.realtek.com/Download/List?cate_id=584
# I've verified manually (`diff -r`) that the source code for version 8.053.00
# is the same as the one available on the realtek website.
src = fetchFromGitHub {
owner = "mtorromeo";
repo = "r8168";
rev = version;
sha256 = "01mi7hh92nc7jaxkfrpz7j0ci78djrhgmq0im4k1270mwmvr0yzj";
sha256 = "0bHGs8jyWd+ZiixOoNkBqhS9RjDpRp3vveAgk1YuOWU=";
};
hardeningDisable = [ "pic" ];
@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
'';
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ timokau ];
broken = (lib.versions.majorMinor kernel.modDirVersion) != "5.15";
maintainers = with maintainers; [];
broken = lib.versionAtLeast kernel.modDirVersion "6.9";
};
}

View File

@ -7,12 +7,12 @@
, stdenv
}:
let
version = "24.1.6";
version = "24.1.7";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-zLqeokN84LrthNOg2wRmCy324sk4cMDPaTcdDbdhIoY=";
sha256 = "sha256-+JCFbLWDhqHYYpeNPpcGXL8tNsi4jpGbAd8DGSIsc7A=";
};
server = callPackage ./server.nix { inherit src version; };
in

View File

@ -8,18 +8,18 @@
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
version = "0.101.0";
version = "0.102.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "sha256-WdMQnAYAdyvS0uyRzvLnhi1HeoWqmUQSIq6MdcP7NfY=";
sha256 = "sha256-syl4mvh78otLWnDpu/7DHlAq0UqQ+4Alg8tZ16OYBQ4=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorHash = "sha256-LM9Co4XpmyIOTVllhiiON4R8OYTO5OjY9Wn+LrU6PIM=";
vendorHash = "sha256-SEj2waLnThV+anIdtZisJDusTrjObSXNPWIrWoL0gNA=";
# there is a nested go.mod
sourceRoot = "${src.name}/cmd/otelcontribcol";

View File

@ -1,14 +1,14 @@
{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase }:
{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase, unstableGitUpdater }:
stdenv.mkDerivation (finalAttrs: {
pname = "qt6gtk2";
version = "0.2";
version = "0.2-unstable-2024-05-06";
src = fetchFromGitHub {
owner = "trialuser02";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-g5ZCwTnNEJJ57zEwNqMxrl0EWYJMt3PquZ2IsmxQYqk=";
rev = "d29ba6c1fb4ac933ed7b91f0480cbd0c5a975ab8";
hash = "sha256-lIUCdfsmvuzDQaOi2U/CHch1re6Jn6yDfcX26Gu0eUo=";
};
buildInputs = [ gtk2 qtbase ];
@ -16,15 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapQtApps = true;
installPhase = ''
runHook preInstall
qmakeFlags = [
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
];
mkdir -p $out/lib/qt-6/plugins/{platformthemes,styles}
cp -pr src/qt6gtk2-qtplugin/libqt6gtk2.so $out/lib/qt-6/plugins/platformthemes
cp -pr src/qt6gtk2-style/libqt6gtk2-style.so $out/lib/qt-6/plugins/styles
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "GTK+2.0 integration plugins for Qt6";