Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-06-02 12:01:17 +00:00 committed by GitHub
commit c56c306bc3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
48 changed files with 1072 additions and 287 deletions

View File

@ -6,8 +6,7 @@ let
cfg = config.services.emacs;
editorScript = pkgs.writeScriptBin "emacseditor" ''
#!${pkgs.runtimeShell}
editorScript = pkgs.writeShellScriptBin "emacseditor" ''
if [ -z "$1" ]; then
exec ${cfg.package}/bin/emacsclient --create-frame --alternate-editor ${cfg.package}/bin/emacs
else
@ -70,8 +69,8 @@ in
description = "Emacs: the extensible, self-documenting text editor";
serviceConfig = {
Type = "forking";
ExecStart = "${pkgs.bash}/bin/bash -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --daemon'";
Type = "notify";
ExecStart = "${pkgs.runtimeShell} -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --fg-daemon'";
ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)";
Restart = "always";
};

View File

@ -119,7 +119,7 @@ let
-o ${escapeShellArg cfg.user } \
-g ${escapeShellArg cfg.group} \
<(hexdump -n 16 -e '"%02x"' /dev/urandom) \
"$RUNTIME_DIRECTORY/cookie"
"''${RUNTIME_DIRECTORY%%:*}/cookie"
'';
};
@ -131,7 +131,7 @@ let
-o ${escapeShellArg cfg.user} \
-g ${escapeShellArg cfg.group} \
${escapeShellArg cfg.dist.cookie._secret} \
"$RUNTIME_DIRECTORY/cookie"
"''${RUNTIME_DIRECTORY%%:*}/cookie"
'';
};
@ -181,7 +181,7 @@ let
name = "akkoma-config";
runtimeInputs = with pkgs; [ coreutils replace-secret ];
text = ''
cd "$RUNTIME_DIRECTORY"
cd "''${RUNTIME_DIRECTORY%%:*}"
tmp="$(mktemp config.exs.XXXXXXXXXX)"
trap 'rm -f "$tmp"' EXIT TERM
@ -279,7 +279,7 @@ let
cd "${cfg.package}"
RUNTIME_DIRECTORY="''${RUNTIME_DIRECTORY:-/run/akkoma}"
AKKOMA_CONFIG_PATH="$RUNTIME_DIRECTORY/config.exs" \
AKKOMA_CONFIG_PATH="''${RUNTIME_DIRECTORY%%:*}/config.exs" \
ERL_EPMD_ADDRESS="${cfg.dist.address}" \
ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \
ERL_FLAGS=${lib.escapeShellArg (lib.escapeShellArgs ([
@ -287,7 +287,7 @@ let
"-kernel" "inet_dist_listen_min" (toString cfg.dist.portMin)
"-kernel" "inet_dist_listen_max" (toString cfg.dist.portMax)
] ++ cfg.dist.extraFlags))} \
RELEASE_COOKIE="$(<"$RUNTIME_DIRECTORY/cookie")" \
RELEASE_COOKIE="$(<"''${RUNTIME_DIRECTORY%%:*}/cookie")" \
RELEASE_NAME="akkoma" \
exec "${cfg.package}/bin/$(basename "$0")" "$@"
'';
@ -984,7 +984,7 @@ in {
RemainAfterExit = true;
UMask = "0077";
RuntimeDirectory = "akkoma";
RuntimeDirectory = mkBefore "akkoma";
ExecStart = mkMerge [
(mkIf (cfg.dist.cookie == null) [ genScript ])
@ -1072,7 +1072,7 @@ in {
ProtectProc = "noaccess";
ProcSubset = "pid";
ProtectSystem = mkIf (!isConfined) "strict";
ProtectSystem = "strict";
ProtectHome = true;
PrivateTmp = true;
PrivateDevices = true;

View File

@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "7.10.0";
version = "7.11.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-GvvvoqLBzapveKFSqlED471pUyRjLoYqU5YjN/L/nEs=";
hash = "sha256-JSQ8BpZf7ZvLld3GM5/yfLS+zRiFGi0r7V67Xb662Os=";
};
patches = [

View File

@ -1,33 +1,35 @@
{ lib
, fetchFromGitHub
, bash
, glib
, gdk-pixbuf
, gettext
, imagemagick
, ninja
, meson
, sassc
, python3Packages
, gobject-introspection
, wrapGAppsHook3
, libappindicator-gtk3
, libxcb
, qt5
, ibus
, usbutils
{
lib,
fetchFromGitHub,
bash,
glib,
gdk-pixbuf,
gettext,
imagemagick,
ninja,
meson,
sassc,
python3Packages,
gobject-introspection,
wrapGAppsHook3,
libayatana-appindicator,
libxcb,
qt6,
ibus,
usbutils,
psmisc,
}:
python3Packages.buildPythonApplication rec {
name = "polychromatic";
version = "0.8.0";
version = "0.9.1";
format = "other";
src = fetchFromGitHub {
owner = "polychromatic";
repo = "polychromatic";
rev = "v${version}";
sha256 = "sha256-ym2pcGUWM5zCUx/lYs+WECj+wbyBtWnx04W/NRXNKlw=";
sha256 = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s=";
};
postPatch = ''
@ -49,23 +51,31 @@ python3Packages.buildPythonApplication rec {
ninja
sassc
wrapGAppsHook3
qt5.wrapQtAppsHook
qt6.wrapQtAppsHook
qt6.qtbase
];
propagatedBuildInputs = with python3Packages; [
colorama
colour
openrazer
pyqt5
pyqtwebengine
requests
setproctitle
libxcb
openrazer-daemon
libappindicator-gtk3
ibus
usbutils
];
buildInputs = [ qt6.qtwayland ];
propagatedBuildInputs =
with python3Packages;
[
colorama
colour
openrazer
pyqt6
pyqt6-webengine
requests
setproctitle
libxcb
openrazer-daemon
ibus
usbutils
]
++ [
libayatana-appindicator
psmisc
];
dontWrapGapps = true;
dontWrapQtApps = true;

View File

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "planify";
version = "4.7.4";
version = "4.8";
src = fetchFromGitHub {
owner = "alainm23";
repo = "planify";
rev = version;
hash = "sha256-x76HasjETqXqE5yXE69/69NAYEWAksHSt0nYRq8/P0k=";
hash = "sha256-uzZYrn1nbDoLSYyO1Y2YJk35+1WfVckSgGproaHKTOQ=";
};
nativeBuildInputs = [

View File

@ -1,20 +1,149 @@
GEM
remote: https://rubygems.org/
specs:
git_fame (2.5.2)
hirb (~> 0.7.3)
memoist (~> 0.14.0)
method_profiler (~> 2.0.1)
progressbar (~> 0.21.0)
scrub_rb (~> 1.0.1)
trollop (~> 2.1.2)
hirb (0.7.3)
memoist (0.14.0)
method_profiler (2.0.1)
hirb (>= 0.6.0)
progressbar (0.21.0)
scrub_rb (1.0.1)
trollop (2.1.2)
git_fame (3.1.1)
activesupport (~> 7.0)
dry-initializer (~> 3.0)
dry-struct (~> 1.0)
dry-types (~> 1.0)
neatjson (~> 0.9)
rugged (~> 1.0)
tty-box (~> 0.5)
tty-option (~> 0.2)
tty-screen (~> 0.5)
tty-spinner (~> 0.9)
tty-table (~> 0.9, <= 0.10.0)
zeitwerk (~> 2.0)
activesupport (7.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
ast (2.4.2)
coderay (1.1.3)
concurrent-ruby (1.2.2)
diff-lcs (1.5.0)
docile (1.4.0)
dry-core (1.0.0)
concurrent-ruby (~> 1.0)
zeitwerk (~> 2.6)
dry-inflector (1.0.0)
dry-initializer (3.1.1)
dry-logic (1.5.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
dry-struct (1.6.0)
dry-core (~> 1.0, < 2)
dry-types (>= 1.7, < 2)
ice_nine (~> 0.11)
zeitwerk (~> 2.6)
dry-types (1.7.1)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0)
dry-inflector (~> 1.0)
dry-logic (~> 1.4)
zeitwerk (~> 2.6)
equatable (0.5.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
faker (3.1.1)
i18n (>= 1.8.11, < 2)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
method_source (1.0.0)
minitest (5.18.1)
neatjson (0.10.5)
necromancer (0.4.0)
parallel (1.22.1)
parser (3.2.1.1)
ast (~> 2.4.1)
pastel (0.7.2)
equatable (~> 0.5.0)
tty-color (~> 0.4.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.7.0)
rexml (3.2.5)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.1)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-github (2.4.0)
rspec-core (~> 3.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.12.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rubocop (1.24.1)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.28.0)
parser (>= 3.2.1.0)
rubocop-md (1.2.0)
rubocop (>= 1.0)
rubocop-performance (1.16.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.11.1)
rubocop (~> 1.19)
ruby-progressbar (1.13.0)
rugged (1.6.3)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-cobertura (2.1.0)
rexml
simplecov (~> 0.19)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
strings (0.1.8)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
tty-box (0.5.0)
pastel (~> 0.7.2)
strings (~> 0.1.6)
tty-cursor (~> 0.7)
tty-color (0.4.3)
tty-cursor (0.7.1)
tty-option (0.2.0)
tty-screen (0.6.5)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
tty-table (0.10.0)
equatable (~> 0.5.0)
necromancer (~> 0.4.0)
pastel (~> 0.7.2)
strings (~> 0.1.0)
tty-screen (~> 0.6.4)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (1.8.0)
unicode_utils (1.4.0)
zeitwerk (2.6.7)
PLATFORMS
ruby
@ -23,4 +152,4 @@ DEPENDENCIES
git_fame
BUNDLED WITH
2.1.4
2.3.3

View File

@ -1,60 +1,653 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk";
type = "gem";
};
version = "7.0.6";
};
ast = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem";
};
version = "2.4.2";
};
coderay = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
type = "gem";
};
version = "1.1.3";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
version = "1.2.2";
};
diff-lcs = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
type = "gem";
};
version = "1.5.0";
};
docile = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz";
type = "gem";
};
version = "1.4.0";
};
dry-core = {
dependencies = ["concurrent-ruby" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks";
type = "gem";
};
version = "1.0.0";
};
dry-inflector = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka";
type = "gem";
};
version = "1.0.0";
};
dry-initializer = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v3dah1r96b10m8xjixmdmymg7dr16wn5715id4vxjkw6vm7s9jd";
type = "gem";
};
version = "3.1.1";
};
dry-logic = {
dependencies = ["concurrent-ruby" "dry-core" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr";
type = "gem";
};
version = "1.5.0";
};
dry-struct = {
dependencies = ["dry-core" "dry-types" "ice_nine" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rnlgn4wif0dvkvi10xwh1vd1q6mp35q6a7lwva0zmbc79dh4drp";
type = "gem";
};
version = "1.6.0";
};
dry-types = {
dependencies = ["concurrent-ruby" "dry-core" "dry-inflector" "dry-logic" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj";
type = "gem";
};
version = "1.7.1";
};
equatable = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x";
type = "gem";
};
version = "0.5.0";
};
factory_bot = {
dependencies = ["activesupport"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq";
type = "gem";
};
version = "6.2.1";
};
faker = {
dependencies = ["i18n"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09";
type = "gem";
};
version = "3.1.1";
};
git_fame = {
dependencies = ["hirb" "memoist" "method_profiler" "progressbar" "scrub_rb" "trollop"];
dependencies = ["activesupport" "dry-initializer" "dry-struct" "dry-types" "neatjson" "rugged" "tty-box" "tty-option" "tty-screen" "tty-spinner" "tty-table" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02k5ls5zyif8skdbnym6zw9y76whlnksw2m94jsh2n1ygk98izdd";
sha256 = "1jqvhzwgvr2bpi4ldqidbcs9prb0xsikp50xx4r8dwhf8m9mh26h";
type = "gem";
};
version = "2.5.2";
version = "3.1.1";
};
hirb = {
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji";
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
type = "gem";
};
version = "0.7.3";
version = "1.14.1";
};
memoist = {
ice_nine = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03d3h6kp16bf0crqg1cxdgp1d2iyzn53d3phbmjh4pjybqls0gcm";
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
type = "gem";
};
version = "0.14.0";
version = "0.11.2";
};
method_profiler = {
dependencies = ["hirb"];
method_source = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ax04qrrv7fqp5ayxaxhn72660pybdkpkvmgiwbg7bs7x5ijjzd8";
sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
type = "gem";
};
version = "2.0.1";
version = "1.0.0";
};
progressbar = {
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17haw9c6c9q6imsn83pii32jnihpg76jgd09x7y4hjqq45n3qcdh";
sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
type = "gem";
};
version = "0.21.0";
version = "5.18.1";
};
scrub_rb = {
neatjson = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dwg33w83w17aiij9kcbi7irj7lh045nh9prjgkzjya3f1j60d3x";
sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s";
type = "gem";
};
version = "1.0.1";
version = "0.10.5";
};
trollop = {
necromancer = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
type = "gem";
};
version = "2.1.2";
version = "0.4.0";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
type = "gem";
};
version = "1.22.1";
};
parser = {
dependencies = ["ast"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc";
type = "gem";
};
version = "3.2.1.1";
};
pastel = {
dependencies = ["equatable" "tty-color"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1";
type = "gem";
};
version = "0.7.2";
};
pry = {
dependencies = ["coderay" "method_source"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4";
type = "gem";
};
version = "0.14.2";
};
rainbow = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
version = "3.1.1";
};
rake = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
version = "13.0.6";
};
regexp_parser = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q";
type = "gem";
};
version = "2.7.0";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
type = "gem";
};
version = "3.12.0";
};
rspec-core = {
dependencies = ["rspec-support"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f";
type = "gem";
};
version = "3.12.1";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
type = "gem";
};
version = "3.12.2";
};
rspec-github = {
dependencies = ["rspec-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kqjmd85v2fpb06d0rx43dc51f0igc1gmm8y3nz0wvmy7zg02njm";
type = "gem";
};
version = "2.4.0";
};
rspec-its = {
dependencies = ["rspec-core" "rspec-expectations"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad";
type = "gem";
};
version = "1.3.0";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dcfh85m3ksir6n8gydsal4d85chpww1b2nahb05nl8xhgh0r2ij";
type = "gem";
};
version = "3.12.4";
};
rspec-support = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
type = "gem";
};
version = "3.12.0";
};
rubocop = {
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sn7ag295blmhpwv6x472m3fd0n25swz9imqwpk0hg21rdcdw7p0";
type = "gem";
};
version = "1.24.1";
};
rubocop-ast = {
dependencies = ["parser"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5";
type = "gem";
};
version = "1.28.0";
};
rubocop-md = {
dependencies = ["rubocop"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11j802r5r022vxzycvwvzhyg24g8dky4slbvid24xi0ji73q444z";
type = "gem";
};
version = "1.2.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc";
type = "gem";
};
version = "1.16.0";
};
rubocop-rake = {
dependencies = ["rubocop"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nyq07sfb3vf3ykc6j2d5yq824lzq1asb474yka36jxgi4hz5djn";
type = "gem";
};
version = "0.6.0";
};
rubocop-rspec = {
dependencies = ["rubocop"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ivc9kgz18cn32iqi9wv5aj903yhamwddw84l7nklbl9xxvwz603";
type = "gem";
};
version = "2.11.1";
};
ruby-progressbar = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
type = "gem";
};
version = "1.13.0";
};
rugged = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in";
type = "gem";
};
version = "1.6.3";
};
simplecov = {
dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py";
type = "gem";
};
version = "0.22.0";
};
simplecov-cobertura = {
dependencies = ["rexml" "simplecov"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c";
type = "gem";
};
version = "2.1.0";
};
simplecov-html = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb";
type = "gem";
};
version = "0.12.3";
};
simplecov_json_formatter = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j";
type = "gem";
};
version = "0.1.4";
};
strings = {
dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0";
type = "gem";
};
version = "0.1.8";
};
strings-ansi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh";
type = "gem";
};
version = "0.2.0";
};
tty-box = {
dependencies = ["pastel" "strings" "tty-cursor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5";
type = "gem";
};
version = "0.5.0";
};
tty-color = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk";
type = "gem";
};
version = "0.4.3";
};
tty-cursor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
type = "gem";
};
version = "0.7.1";
};
tty-option = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xibs7kgbsw401ywfw67wg47fmm7sdcypy85m25af9r2q2hbq7gb";
type = "gem";
};
version = "0.2.0";
};
tty-screen = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1";
type = "gem";
};
version = "0.6.5";
};
tty-spinner = {
dependencies = ["tty-cursor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
type = "gem";
};
version = "0.9.3";
};
tty-table = {
dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg";
type = "gem";
};
version = "0.10.0";
};
tzinfo = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem";
};
version = "2.0.6";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
type = "gem";
};
version = "1.8.0";
};
unicode_utils = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
type = "gem";
};
version = "1.4.0";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
type = "gem";
};
version = "2.6.7";
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.27.0";
version = "2.27.1";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-YM/9ijwxDAjFZk/ku33b/pMYri5V1h0wPd2YS7qJgCw=";
hash = "sha256-miAfEllN7/qDBD8UQZIfUeXSezEhmSwMo6oTDfiw2Bk=";
};
postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-ztqWSoDsN8qdm6Jq8Wo7r16zuXENQDp2JvwSN+6Jbxw=";
vendorHash = "sha256-5HJ4qaPD1pbBFKgAArW0CKNBuP7pjxswZe3rHgjsgLg=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

View File

@ -1,14 +1,15 @@
{ stdenv
, buildFHSEnv
, fetchurl
, fetchzip
, lib
, zlib
, gdbm
, bzip2
, libxslt
, libxml2
, libuuid
, readline
, readline70
, xz
, cups
, glibc
@ -25,23 +26,51 @@
, python3
, autoPatchelfHook
, makeWrapper
, sqlite
, enableInstaller ? false
, enableMacOSGuests ? false, fetchFromGitHub, gnutar, unzip
, symlinkJoin
, enableInstaller ? false, bzip2, sqlite
, enableMacOSGuests ? false, fetchFromGitHub, unzip
, enableGuestTools ? true,
}:
let
# base - versions
version = "17.5.2";
build = "23775571";
baseUrl = "https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${version}/${build}/linux";
# tools - versions
toolsVersion = "12.4.0";
toolsBuild = "23259341";
# macOS - versions
fusionVersion = "13.5.1";
fusionBuild = "23298085";
fusionVersion = "13.5.2";
fusionBuild = "23775688";
unlockerVersion = "3.0.5";
# macOS - ISOs
darwinIsoSrc = fetchurl {
url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/universal/core/com.vmware.fusion.zip.tar";
sha256 = "sha256-bn6hoicby2YVj1pZTBzBhabNhKefzVQTm5vIrdTO2K4=";
guestToolsSrc =
let
fetchComponent = (system: hash: fetchzip {
inherit hash;
url = "${baseUrl}/packages/vmware-tools-${system}-${toolsVersion}-${toolsBuild}.x86_64.component.tar";
stripRoot = false;
} + "/vmware-tools-${system}-${toolsVersion}-${toolsBuild}.x86_64.component");
in lib.mapAttrsToList fetchComponent {
linux = "sha256-vT08mR6cCXZjiQgb9jy+MaqYzS0hFbNUM7xGAHIJ8Ao=";
linuxPreGlibc25 = "sha256-BodN1lxuhxyLlxIQSlVhGKItJ10VPlti/sEyxcRF2SA=";
netware = "sha256-o/S4wAYLR782Fn20fTQ871+rzsa1twnAxb9laV16XIk=";
solaris = "sha256-3LdFoI4TD5zxlohDGR3DRGbF6jwDZAoSMEpHWU4vSGU=";
winPre2k = "sha256-+QcvWfY3aCDxUwAfSuj7Wf9sxIO+ztWBrRolMim8Dfw=";
winPreVista = "sha256-3NgO/GdRFTpKNo45TMet0msjzxduuoF4nVLtnOUTHUA=";
windows = "sha256-2F7UPjNvtibmWAJxpB8IOnol12aMOGMy+403WeCTXw8=";
};
# macOS - ISOs
darwinIsoSrc = fetchzip {
url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/universal/core/com.vmware.fusion.zip.tar";
sha256 = "sha256-DDLRWAVRI3ZeXV5bUXWwput9mEC1qsJUsjojI0CJYMI=";
stripRoot = false;
} + "/com.vmware.fusion.zip";
# macOS - Unlocker
unlockerSrc = fetchFromGitHub {
owner = "paolo-projects";
@ -68,11 +97,18 @@ let
name = "vmware-unpack-env";
targetPkgs = pkgs: [ zlib ];
};
readline70_compat63 = symlinkJoin {
name = "readline70_compat63";
paths = [ readline70 ];
postBuild = ''
ln -s $out/lib/libreadline.so $out/lib/libreadline.so.6
'';
};
in
stdenv.mkDerivation rec {
pname = "vmware-workstation";
version = "17.5.1";
build = "23298084";
inherit version build;
buildInputs = [
libxslt
@ -96,21 +132,24 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ]
++ lib.optionals enableInstaller [ sqlite bzip2 ]
++ lib.optionals enableMacOSGuests [ gnutar unzip ];
++ lib.optionals enableInstaller [ bzip2 sqlite readline70_compat63 ]
++ lib.optionals enableMacOSGuests [ unzip ];
src = fetchurl {
url = "https://download3.vmware.com/software/WKST-${builtins.replaceStrings ["."] [""] version}-LX/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
sha256 = "sha256-qmC3zvKoes77z3x6UkLHsJ17kQrL1a/rxe9mF+UMdJY=";
};
src = fetchzip {
url = "${baseUrl}/core/VMware-Workstation-${version}-${build}.x86_64.bundle.tar";
sha256 = "sha256-5PZZpXN/V687TXjqeTm8MEays4/QTf02jVfdpi9C7GI=";
stripRoot = false;
} + "/VMware-Workstation-${version}-${build}.x86_64.bundle";
unpackPhase = ''
${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked"
unpackPhase = let
guestTools = lib.optionalString enableGuestTools (lib.concatMapStringsSep " " (src: "--install-component ${src}") guestToolsSrc);
in
''
${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} ${guestTools} --extract unpacked"
${lib.optionalString enableMacOSGuests ''
mkdir -p fusion/
tar -xvpf "${darwinIsoSrc}" -C fusion/
unzip "fusion/com.vmware.fusion.zip" \
unzip "${darwinIsoSrc}" \
"payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \
"payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \
-d fusion/
@ -173,7 +212,7 @@ stdenv.mkDerivation rec {
component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=<version>)[^<]+")
component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1")
type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1")
sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"$component\",\"$component_version\",\"${build}\",$component_core_id,\"$component\",\"$component\",$type);"
sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES('$component','$component_version',${build},$component_core_id,'$component','$component',$type);"
mkdir -p $out/etc/vmware-installer/components/$component
cp -r $folder/* $out/etc/vmware-installer/components/$component
done
@ -255,9 +294,10 @@ stdenv.mkDerivation rec {
unpacked="unpacked/vmware-network-editor"
cp -r $unpacked/lib $out/lib/vmware/
## VMware Tools
echo "Installing VMware Tools"
mkdir -p $out/lib/vmware/isoimages/
${lib.optionalString enableGuestTools ''
echo "Installing VMware Tools"
cp unpacked/vmware-tools-linux/linux.iso \
unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \
unpacked/vmware-tools-netware/netware.iso \
@ -266,6 +306,7 @@ stdenv.mkDerivation rec {
unpacked/vmware-tools-winPreVista/winPreVista.iso \
unpacked/vmware-tools-windows/windows.iso \
$out/lib/vmware/isoimages/
''}
${lib.optionalString enableMacOSGuests ''
echo "Installing VMWare Tools for MacOS"

View File

@ -0,0 +1,56 @@
{
stdenvNoCC,
lib,
fetchFromGitHub,
unstableGitUpdater,
variant ? "macchiato",
}:
let
pname = "catppuccin-plymouth";
validVariants = [
"latte"
"frappe"
"macchiato"
"mocha"
];
in
lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
stdenvNoCC.mkDerivation
(finalAttrs: {
inherit pname;
version = "0-unstable-2024-05-28";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "plymouth";
rev = "e13c348a0f47772303b2da1e9396027d8cda160d";
hash = "sha256-6DliqhRncvdPuKzL9LJec3PJWmK/jo9BrrML7g6YcH0=";
};
sourceRoot = "${finalAttrs.src.name}/themes/catppuccin-${variant}";
installPhase = ''
runHook preInstall
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth
mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
cp * $out/share/plymouth/themes/catppuccin-${variant}
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "Soothing pastel theme for Plymouth";
homepage = "https://github.com/catppuccin/plymouth";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
johnrtitor
spectre256
];
};
})

View File

@ -64,11 +64,11 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "google-chrome";
version = "125.0.6422.112";
version = "125.0.6422.141";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-Tx9SGob0b4mndk+zIhSL8MAuCUdwz2HrbnhfXYYfEUo=";
hash = "sha256-nIdzl3DkvGy9EsNS8nvPi8yK0gvx9mFaxYSxuYZZzxI=";
};
nativeBuildInputs = [ patchelf makeWrapper ];

View File

@ -11,7 +11,7 @@
openssl,
pkg-config,
protobuf_24,
protobuf_25,
grpc,
pandoc,
python3,
@ -19,6 +19,7 @@
wget,
lib,
jq,
coreutils,
curl,
libarchive,
@ -27,13 +28,13 @@ let stdenv = gccStdenv;
in
stdenv.mkDerivation rec {
pname = "justbuild";
version = "1.2.4";
version = "1.3.1";
src = fetchFromGitHub {
owner = "just-buildsystem";
repo = "justbuild";
rev = "v${version}";
sha256 = "sha256-+ZQuMWqZyK7x/tPSi2ldSOpAexpX6ku4ikk/V8m6Ksg=";
sha256 = "sha256-kv7HpDEYZml5uk06s8Cxt5rEpxaJBz9s+or6Od1q4Io=";
};
bazelapi = fetchurl {
@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
python3
unzip
wget
coreutils
# Dependencies of just
cli11
@ -75,21 +77,14 @@ stdenv.mkDerivation rec {
grpc
libgit2
openssl
# Using protobuf 24 because the current version of grpc is build using
# protobuf 24 and therefore the older protobuf version causes errors
# during build.
# Upstream currently uses protobuf 23 for bundled builds
# For future updates: The currently used version can be found in the file
# etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json
# under the key .repositories.protobuf
protobuf_24
protobuf_25
python3
];
postPatch = ''
sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_24}"' etc/repos.json > etc/repos.json.patched
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json
jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json
@ -133,7 +128,6 @@ stdenv.mkDerivation rec {
__EOF__
export PKG_CONFIG_PATH=`pwd`/.pkgconfig''${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH
# Bootstrap just
export PACKAGE=YES
export NON_LOCAL_DEPS='[ "google_apis", "bazel_remote_apis" ]'
@ -143,8 +137,7 @@ stdenv.mkDerivation rec {
python3 ./bin/bootstrap.py `pwd` ../build "`pwd`/.distfiles"
# Build compiled just-mr
mkdir ../build-root
../build/out/bin/just install 'installed just-mr' -c ../build/build-conf.json -C ../build/repo-conf.json --output-dir ../build/out --local-build-root ../build-root
../build/out/bin/just install 'installed just-mr' -c ../build/build-conf.json -C ../build/repo-conf.json --output-dir ../build/out --local-build-root ../build/.just
# convert man pages from Markdown to man
find "./share/man" -name "*.md" -exec sh -c '${pandoc}/bin/pandoc --standalone --to man -o "''${0%.md}" "''${0}"' {} \;
@ -160,6 +153,7 @@ stdenv.mkDerivation rec {
install -m 755 -Dt "$out/bin" "../build/out/bin/just"
install -m 755 -Dt "$out/bin" "../build/out/bin/just-mr"
install -m 755 -DT "bin/just-import-git.py" "$out/bin/just-import-git"
install -m 755 -DT "bin/just-deduplicate-repos.py" "$out/bin/just-deduplicate-repos"
mkdir -p "$out/share/bash-completion/completions"
install -m 0644 ./share/just_complete.bash "$out/share/bash-completion/completions/just"

View File

@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "marwaita-x";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = "marwaita-x";
rev = finalAttrs.version;
sha256 = "sha256-uSJfrM1QOTTV03WS6BpQh3GCgkW4+9w3aw+giwiCYWU=";
sha256 = "sha256-BygdRRS+d8iP6f2NQ0RmZh14/goP9NoNzg6tpcpOz8c=";
};
buildInputs = [

View File

@ -1,43 +0,0 @@
{ stdenvNoCC
, lib
, fetchFromGitHub
, variant ? "macchiato"
}:
let
pname = "catppuccin-plymouth";
validVariants = [ "latte" "frappe" "macchiato" "mocha" ];
in
lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "unstable-2022-12-10";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "plymouth";
rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
};
sourceRoot = "${src.name}/themes/catppuccin-${variant}";
installPhase = ''
runHook preInstall
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth
mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
cp * $out/share/plymouth/themes/catppuccin-${variant}
runHook postInstall
'';
meta = with lib; {
description = "Soothing pastel theme for Plymouth";
homepage = "https://github.com/catppuccin/plymouth";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.spectre256 ];
};
}

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, buildPackages
, cmake
, gtest
, jre
@ -49,6 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
checkTarget = "tests";
cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
(lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
(lib.cmakeFeature "PROTOC_BIN" (lib.getExe buildPackages.protobuf))
];
meta = with lib; {
changelog = "https://github.com/google/libphonenumber/blob/${finalAttrs.src.rev}/release_notes.txt";
description = "Google's i18n library for parsing and using phone numbers";

View File

@ -80,6 +80,12 @@
, doxygen
, graphviz-nox
, runAccuracyTests ? true
, runPerformanceTests ? false
# Modules to enable via BUILD_LIST to build a customized opencv.
# An empty lists means this setting is ommited which matches upstreams default.
, enabledModules ? [ ]
, AVFoundation
, Cocoa
, VideoDecodeAcceleration
@ -234,8 +240,6 @@ let
opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
runAccuracyTests = true;
runPerformanceTests = false;
printEnabled = enabled: if enabled then "ON" else "OFF";
withOpenblas = (enableBlas && blas.provider.pname == "openblas");
#multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests
@ -254,6 +258,7 @@ effectiveStdenv.mkDerivation {
outputs = [
"out"
"cxxdev"
] ++ lib.optionals (runAccuracyTests || runPerformanceTests) [
"package_tests"
];
cudaPropagateToOutput = "cxxdev";
@ -479,6 +484,8 @@ effectiveStdenv.mkDerivation {
"-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so"
] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
] ++ lib.optionals (enabledModules != [ ]) [
"-DBUILD_LIST=${lib.concatStringsSep "," enabledModules}"
];
postBuild = lib.optionalString enableDocs ''

View File

@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${finalAttrs.version}";
hash = "sha256-cGMS0lEtgd64rjeEfYwJplf9rva0FtpaQMCfxyramE8=";
hash = "sha256-1aeXcN9DwPE8CoaxCqCNL9UEcRHJdaKxS7Ivjp3YNN8=";
};
nativeBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.63.0";
version = "3.66.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "adafruit_platformdetect";
inherit version;
hash = "sha256-bntcP/P0eoQsjIQQcJLtsXsPcSylKVNUp+f/RC/U5m4=";
hash = "sha256-GWxtuHMEshb+8JlKgBXxp5atB9cewhylgkSVH8tf7TA=";
};
build-system = [ setuptools-scm ];

View File

@ -366,7 +366,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.115";
version = "1.34.117";
pyproject = true;
disabled = pythonOlder "3.7";
@ -374,7 +374,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-HVjd5oeQPpuM0BsmgCGazjmBqrcvghZbWLsKVs/yzj8=";
hash = "sha256-2awDTdlD1UXR8GeteXbNvHKcaJ0WyWG4vCbsWVg4vqw=";
};
build-system = [ setuptools ];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "confection";
version = "0.1.4";
version = "0.1.5";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "explosion";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-PWtxLcnPd7V4yeHfOl1kYPr5UeqkYCfzGE/DoL94tq0=";
hash = "sha256-1XIo9Hg4whYS1AkFeX8nVnpv+IvnpmyydHYdVYS0xZc=";
};
propagatedBuildInputs = [

View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "deebot-client";
version = "7.2.0";
version = "7.3.0";
pyproject = true;
disabled = pythonOlder "3.12";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "DeebotUniverse";
repo = "client.py";
rev = "refs/tags/${version}";
hash = "sha256-5GALvd9p+ksxWqkfkSd07mPNzQSbdeGzrUjQU2nWs3g=";
hash = "sha256-zXe110cGrrnwZvQ3pI9Zka7bcuUS/Js+7A3k6OljAYI=";
};
build-system = [

View File

@ -3,8 +3,6 @@
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pythonRelaxDepsHook,
cookiecutter,
datasets,
dill,
fsspec,
@ -14,32 +12,29 @@
numpy,
packaging,
pandas,
pyarrow,
requests,
responses,
setuptools,
tqdm,
xxhash,
}:
buildPythonPackage rec {
pname = "evaluate";
version = "0.4.1";
format = "setuptools";
version = "0.4.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
repo = "evaluate";
rev = "refs/tags/v${version}";
hash = "sha256-axcJg0ZalEd4FOySCiFReKL7wmTCtLaw71YqyLHq8fc=";
hash = "sha256-CGBluY7wFr+RdUW4QTUN18z1WKAB104ayrkzzPZHZ/w=";
};
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "responses" ];
build-system = [ setuptools ];
propagatedBuildInputs = [
cookiecutter
dependencies = [
datasets
numpy
dill
@ -51,8 +46,6 @@ buildPythonPackage rec {
fsspec
huggingface-hub
packaging
pyarrow
responses
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
# most tests require internet access.

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "findimports";
version = "2.4.0";
version = "2.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mgedmin";
repo = "findimports";
rev = "refs/tags/${version}";
hash = "sha256-ar05DYSc/raYC1RJyLCxDYnd7Zjx20aczywlb6wc67Y=";
hash = "sha256-kHm0TiLe7zvUnU6+MR1M0xOt0gpMDJ5FJ5+HgY0LPeo=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "lacuscore";
version = "1.9.4";
version = "1.9.5";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "LacusCore";
rev = "refs/tags/v${version}";
hash = "sha256-wjkU9rZvR7fySeNvMizLYL3JwsfhicdtezWeuwMCHgM=";
hash = "sha256-PSxNBgehKOWjf6y/RidIegE+P5rg9OzU4p8ZZrXAdq4=";
};
pythonRelaxDeps = [

View File

@ -5,6 +5,7 @@
pythonOlder,
coloredlogs,
datasets,
diffusers,
evaluate,
h5py,
huggingface-hub,
@ -13,6 +14,7 @@
onnxruntime,
packaging,
protobuf,
setuptools,
sympy,
tensorflow,
tf2onnx,
@ -23,8 +25,8 @@
buildPythonPackage rec {
pname = "optimum";
version = "1.19.2";
format = "setuptools";
version = "1.20.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -32,10 +34,12 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "optimum";
rev = "refs/tags/v${version}";
hash = "sha256-GYgLh6vlOoVvTvhNPfBT4YEqRhB7gZMqlOuab6maVGU=";
hash = "sha256-aQNDVNWTgY2LEtug229SEZRMvKHpsQfiTPWW4Lh3hs4=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
coloredlogs
datasets
huggingface-hub
@ -46,7 +50,7 @@ buildPythonPackage rec {
transformers
] ++ transformers.optional-dependencies.sentencepiece;
passthru.optional-dependencies = {
optional-dependencies = {
onnxruntime = [
onnx
onnxruntime
@ -68,9 +72,7 @@ buildPythonPackage rec {
h5py
numpy
];
diffusers = [
# diffusers
];
diffusers = [ diffusers ];
intel = [
# optimum-intel
];

View File

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "playwrightcapture";
version = "1.24.10";
version = "1.24.11";
pyproject = true;
disabled = pythonOlder "3.8";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "Lookyloo";
repo = "PlaywrightCapture";
rev = "refs/tags/v${version}";
hash = "sha256-kjh0ZrFS0jb4CYJfDosLiRffsVzF3/EWPYidBrhStIU=";
hash = "sha256-aDD+eovq6V7c69ORqekcfmDgTGJqvd2lYMIQ2+9TFYY=";
};
pythonRelaxDeps = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pydrawise";
version = "2024.4.1";
version = "2024.6.1";
pyproject = true;
disabled = pythonOlder "3.10";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "dknowles2";
repo = "pydrawise";
rev = "refs/tags/${version}";
hash = "sha256-rJul7UAhgB0a6+3buPlfjnhhy2QOo82gvmRtZB+vrko=";
hash = "sha256-mG1/Cd+w6KqI+KBjJazFBmAQDWZy/y2zFLFGSLVPyz0=";
};
build-system = [

View File

@ -3,19 +3,18 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
poetry-core,
pydicom,
pyfakefs,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
setuptools,
sqlalchemy,
}:
buildPythonPackage rec {
pname = "pynetdicom";
version = "2.0.2";
version = "2.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -24,30 +23,10 @@ buildPythonPackage rec {
owner = "pydicom";
repo = "pynetdicom";
rev = "refs/tags/v${version}";
hash = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM=";
hash = "sha256-gAgNSvNn5VsctqhbT/CzFVhwCEpZwGb1pOh0JwkuAW8=";
};
patches = [
(fetchpatch {
name = "fix-python-3.11-test-attribute-errors.patch";
url = "https://github.com/pydicom/pynetdicom/pull/754/commits/2126bd932d6dfb3f07045eb9400acb7eaa1b3069.patch";
hash = "sha256-t6Lg0sTZSWIE5q5pkBvEoHDQ+cklDn8SgNBcFk1myp4=";
})
(fetchpatch {
# https://github.com/pydicom/pynetdicom/pull/848
name = "replace-setup-with-setup_method1.patch";
url = "https://github.com/pydicom/pynetdicom/commit/09b4e0901445d46868668bc69a7b4f7f00cf6cbb.patch";
hash = "sha256-1ea1A/LU6qY+hd23b6H4OkKHQ0hI2/MYgBgZUZE0kRU=";
})
(fetchpatch {
# https://github.com/pydicom/pynetdicom/pull/848
name = "replace-setup-with-setup_method2.patch";
url = "https://github.com/pydicom/pynetdicom/commit/3966c2d749eeda718caccf9a88a0495d1823825d.patch";
hash = "sha256-C4MSfwwxDgr5T0XQMlR5j2wElPu83TqPhjyNDvfBjJs=";
})
];
build-system = [ setuptools ];
build-system = [ poetry-core ];
dependencies = [ pydicom ];

View File

@ -4,13 +4,14 @@
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
python-dateutil,
requests,
setuptools,
}:
buildPythonPackage rec {
pname = "sunweg";
version = "2.1.1";
version = "3.0.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -19,12 +20,15 @@ buildPythonPackage rec {
owner = "rokam";
repo = "sunweg";
rev = "refs/tags/${version}";
hash = "sha256-fgNtxCBIuNulCfuDaEsM7kL1WpwNE9O+JQ1DMZrz5jA=";
hash = "sha256-9VzDOl393+jm6Nf40X4ZPMBbRc6KOwOQkpTNoqBsw1M=";
};
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [
python-dateutil
requests
];
# Module has no tests
doCheck = false;

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1156";
version = "3.0.1159";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-evhgB8MljJBru+6ovMaUMIwSRcVA+zG+EHYtubSVr7o=";
hash = "sha256-gePrTn1LR28A2C1lZgEGTxSicXW0e6G6rxgh28kBBls=";
};
build-system = [ setuptools ];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tesla-fleet-api";
version = "0.5.12";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.10";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Teslemetry";
repo = "python-tesla-fleet-api";
rev = "refs/tags/v${version}";
hash = "sha256-sUylNOgQzAMdo71eauUYXd4ssZmFwHvnDwF7SEatNAI=";
hash = "sha256-/8XtIUjbz4+d0O1+6fqlRsG8aqhCLSWnpUSq9QFfiAQ=";
};
build-system = [ setuptools ];

View File

@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cppcheck";
version = "2.14.0";
version = "2.14.1";
outputs = [ "out" "man" ];
@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "danmar";
repo = "cppcheck";
rev = finalAttrs.version;
hash = "sha256-w5k7WO2Kwx0ac/vP54ndPUp/AG6jG3MDf03h5z/+Cso=";
hash = "sha256-KXE3zmhaTweQhs0Qh7Xd5ILiuGVewtrvOkRkt8hjU58=";
};
nativeBuildInputs = [

View File

@ -10,20 +10,20 @@
rustPlatform.buildRustPackage rec {
pname = "fnm";
version = "1.35.1";
version = "1.36.0";
src = fetchFromGitHub {
owner = "Schniz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qRnxXh3m/peMNAR/EV+lkwDI+Z6komF8GGFyF5UDOFg=";
sha256 = "sha256-gW/KpoogFbAkOIBnJHTDYyqvxpYeCCabwftCb+T4rnE=";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ];
cargoHash = "sha256-//DCxAC8Jf7g8SkG4NfwkM0NyWUdASuw1g4COFIY0mU=";
cargoHash = "sha256-x66R32vbBakBlrE0eZ+sFJ2/JZ30UTIAvh3goeWkI10=";
doCheck = false;

View File

@ -7,6 +7,14 @@
mkKdeDerivation {
pname = "spectacle";
extraBuildInputs = [qtwayland qtmultimedia opencv];
extraBuildInputs = [
qtwayland
qtmultimedia
(opencv.override {
enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport
enabledModules = [ "core" "imgproc" ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83
runAccuracyTests = false; # tests will fail because of missing plugins but that's okay
})
];
meta.mainProgram = "spectacle";
}

View File

@ -120,7 +120,6 @@ stdenv.mkDerivation rec {
+ lib.optionalString dbusSupport ''
mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
cp -v "dbus/"*service $out/share/dbus-1/system-services
sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"*
cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d
cp -v "systemd/"*.service $out/etc/systemd/system
''

View File

@ -11,14 +11,14 @@
}:
beamPackages.mixRelease rec {
pname = "akkoma";
version = "3.13.1";
version = "3.13.2";
src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "akkoma";
rev = "v${version}";
hash = "sha256-KRU7uEiwBimPz0HA+SClYt9/ubKNaRCArTGSiWvvVg8=";
hash = "sha256-WZAkpJIPzAbqXawNiM3JqE9tJzxrNs/2dGAWVMwLpN4=";
};
postPatch = ''

View File

@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "marcolivierarsenault";
domain = "moonraker";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "marcolivierarsenault";
repo = "moonraker-home-assistant";
rev = "refs/tags/${version}";
hash = "sha256-oFHV9+5byWCOUxUhOvGHNilCZaoOp2xxb33nF8+CYjE=";
hash = "sha256-utxCHXVpP4FQT2poVuS4cMZGgn7yO89lUw5KhIHRXKQ=";
};
propagatedBuildInputs = [

View File

@ -1,4 +1,4 @@
import ./common.nix {
version = "12.0.8";
hash = "sha256-lmlt2bjomXl7UWu3FDUBSLGv0oyXV/8kPhRCtfSUW7w=";
version = "12.0.9";
hash = "sha256-+/pn6Q24QDTaK+Slr+B17fshEXXh6sO1DWRuFGfi2h0=";
}

View File

@ -10,15 +10,15 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-rtlOFfeiZLsoZR/bUPAtWicK1Cu/pxtiBhHdHYbGrHo=";
arm64-linux_hash = "sha256-jMp1kDVCQYtDhO28HoBuo7IAlEaoqPFW8EPYXc1zpKM=";
x64-osx_hash = "sha256-2wcTRqbvlQAFY20IeIQnqWGJYMB1P3z+PftKau1ucdk=";
arm64-osx_hash = "sha256-3CrNLxmk5oHiGHkrKt17tfo021+O6JZ6RKBdsaf0f1I=";
x64-linux_hash = "sha256-MkRKWMhH4x5Z9mURh8qpShaozHrBFOHHwTmFlU1wqS8=";
arm64-linux_hash = "sha256-OIwWZEW4qmL5359hmGdNzunxVTIT3hIbTdAsd5Cpw/k=";
x64-osx_hash = "sha256-uDQXfj4r56ewrhZdwOnF78L3M1o0jDLt/PZlfWxxV18=";
arm64-osx_hash = "sha256-6WUeMIfF5juNHrLqep3mONqfcgxlBJOOJmHJkyHpZhU=";
}."${arch}-${os}_hash";
in
stdenv.mkDerivation rec {
pname = "sonarr";
version = "4.0.4.1491";
version = "4.0.5.1710";
src = fetchurl {
url = "https://github.com/Sonarr/Sonarr/releases/download/v${version}/Sonarr.main.${version}.${os}-${arch}.tar.gz";

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fcitx5-bamboo";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-bamboo";
rev = finalAttrs.version;
hash = "sha256-vEc9z7lFqk+LPP5sTzOYgV7u+/mQY2OsaRsTrtcI/EI=";
hash = "sha256-lWWSk5HxWFJKoE3Rf2s4sYhTSLKDnmPCzYGR/NscqFY=";
fetchSubmodules = true;
};

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
version = "1.226";
version = "1.227";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
sha256 = "sha256-MLNLeCgBzp2awt9ZJM2kaCWQhRnC6sSwm1fHlv3EwHo=";
sha256 = "sha256-EJnxgz+ZKMtl6eIpIPYdXeMAnV/gydgklC/7yG2THpM=";
};
nativeBuildInputs = [ dpkg ];

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "goaccess";
version = "1.9.2";
version = "1.9.3";
src = fetchFromGitHub {
owner = "allinurl";
repo = "goaccess";
rev = "refs/tags/v${version}";
hash = "sha256-FAooBAP2RbqAp7NTJNBdbRVldGCbx3SvOoTaiQ9Fl/I=";
hash = "sha256-ZOngDAHA88YQvkx2pk5ZSpBzxqelvCIR4z5hiFmfGyc=";
};
nativeBuildInputs = [ autoreconfHook ];

View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.6.0";
version = "11.6.3";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-aNYeze2XnrUHaHG+WdRech30Lx5amD5Sk8iQCbD4YTE=";
hash = "sha256-n9OdgD6Z7Dtp5MOOZ1znzlrrup+g+kgTvzVyzyCigH4=";
};
proxyVendor = true;
vendorHash = "sha256-9pretwgZy6kkjcy0vK6DiR+ih6diCewrTXu4Y92OgDU=";
vendorHash = "sha256-7NlPJ3l7y9TLmxpF7Ktn5ZzlCBjzEzmxY4xd1fqZTsY=";
subPackages = [ "apps/cnspec" ];

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2024-05-20";
version = "2024-06-01";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
hash = "sha256-Cizs0dUP0wuwo3jYaL73gXUdxsMEBH91DgdQD6GbHrc=";
hash = "sha256-rXGkr+yzXqptATGW/1d8gMqmxt4hsvwrURpMe1BZppg=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.18.2";
version = "8.18.3";
src = fetchFromGitHub {
owner = "zricethezav";
repo = "gitleaks";
rev = "refs/tags/v${version}";
hash = "sha256-+UPlknAwmIeXlosHBXl3qPREV186lfDZGZG/Zx1rxYs=";
hash = "sha256-OLs3rpP6s6ZyCUKkD5Sl/tAMl3gSBWrUUFYeNffiXEs=";
};
vendorHash = "sha256-30IJNP4XuV2YNy1TumPUju+GrHFBYi76coy0bJBqDI4=";
vendorHash = "sha256-DgCtWRo5KNuFCdhGJvzoH2v8n7mIxNk8eHyZFPUPo24=";
ldflags = [
"-s"

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "jwt-cli";
@ -13,8 +13,17 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-DXyjdwVJUQpOz/Pctl35D00oSgrfehUg8wYyLdttiew=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin Security;
postInstall = ''
installShellCompletion --cmd jwt \
--bash <($out/bin/jwt completion bash) \
--fish <($out/bin/jwt completion fish) \
--zsh <($out/bin/jwt completion zsh)
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/jwt --version > /dev/null

View File

@ -429,8 +429,6 @@ with pkgs;
catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { };
catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { };
btdu = callPackage ../tools/misc/btdu { };
ccal = callPackage ../tools/misc/ccal { };
@ -29010,7 +29008,7 @@ with pkgs;
poly = callPackage ../data/fonts/poly { };
polychromatic = libsForQt5.callPackage ../applications/misc/polychromatic { };
polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
polytopes_db = callPackage ../data/misc/polytopes_db { };

View File

@ -620,6 +620,7 @@ in {
"--enable-soap"
];
doCheck = false;
internalDeps = [ php.extensions.session ];
}
{
name = "sockets";