Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-08-26 06:00:59 +00:00 committed by GitHub
commit 7acb56e802
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
65 changed files with 1572 additions and 2663 deletions

View File

@ -117,6 +117,8 @@
- `services.keyd` changed API. Now you can create multiple configuration files. - `services.keyd` changed API. Now you can create multiple configuration files.
- `baloo`, the file indexer/search engine used by KDE now has a patch to prevent files from constantly being reindexed when the device ids of the their underlying storage changes. This happens frequently when using btrfs or LVM. The patch has not yet been accepted upstream but it provides a significantly improved experience. When upgrading, reset baloo to get a clean index: `balooctl disable ; balooctl purge ; balooctl enable`.
- `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`. - `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`.
- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`. - The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.

View File

@ -4,6 +4,7 @@ use File::Path qw(make_path);
use File::Slurp; use File::Slurp;
use Getopt::Long; use Getopt::Long;
use JSON; use JSON;
use DateTime;
# Keep track of deleted uids and gids. # Keep track of deleted uids and gids.
my $uidMapFile = "/var/lib/nixos/uid-map"; my $uidMapFile = "/var/lib/nixos/uid-map";
@ -22,6 +23,22 @@ sub updateFile {
write_file($path, { atomic => 1, binmode => ':utf8', perms => $perms // 0644 }, $contents) or die; write_file($path, { atomic => 1, binmode => ':utf8', perms => $perms // 0644 }, $contents) or die;
} }
# Converts an ISO date to number of days since 1970-01-01
sub dateToDays {
my ($date) = @_;
my ($year, $month, $day) = split('-', $date, -3);
my $dt = DateTime->new(
year => $year,
month => $month,
day => $day,
hour => 0,
minute => 0,
second => 0,
time_zone => 'UTC',
);
return $dt->epoch / 86400;
}
sub nscdInvalidate { sub nscdInvalidate {
system("nscd", "--invalidate", $_[0]) unless $is_dry; system("nscd", "--invalidate", $_[0]) unless $is_dry;
} }
@ -285,22 +302,26 @@ my %shadowSeen;
foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow", { binmode => ":utf8" }) : ()) { foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow", { binmode => ":utf8" }) : ()) {
chomp $line; chomp $line;
my ($name, $hashedPassword, @rest) = split(':', $line, -9); # struct name copied from `man 3 shadow`
my $u = $usersOut{$name};; my ($sp_namp, $sp_pwdp, $sp_lstch, $sp_min, $sp_max, $sp_warn, $sp_inact, $sp_expire, $sp_flag) = split(':', $line, -9);
my $u = $usersOut{$sp_namp};;
next if !defined $u; next if !defined $u;
$hashedPassword = "!" if !$spec->{mutableUsers}; $sp_pwdp = "!" if !$spec->{mutableUsers};
$hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME $sp_pwdp = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
chomp $hashedPassword; $sp_expire = dateToDays($u->{expires}) if defined $u->{expires};
push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n"; chomp $sp_pwdp;
$shadowSeen{$name} = 1; push @shadowNew, join(":", $sp_namp, $sp_pwdp, $sp_lstch, $sp_min, $sp_max, $sp_warn, $sp_inact, $sp_expire, $sp_flag) . "\n";
$shadowSeen{$sp_namp} = 1;
} }
foreach my $u (values %usersOut) { foreach my $u (values %usersOut) {
next if defined $shadowSeen{$u->{name}}; next if defined $shadowSeen{$u->{name}};
my $hashedPassword = "!"; my $hashedPassword = "!";
$hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword}; $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword};
my $expires = "";
$expires = dateToDays($u->{expires}) if defined $u->{expires};
# FIXME: set correct value for sp_lstchg. # FIXME: set correct value for sp_lstchg.
push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n"; push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::", $expires, "") . "\n";
} }
updateFile("/etc/shadow", \@shadowNew, 0640); updateFile("/etc/shadow", \@shadowNew, 0640);

View File

@ -311,6 +311,17 @@ let
''; '';
}; };
expires = mkOption {
type = types.nullOr (types.strMatching "[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}");
default = null;
description = lib.mdDoc ''
Set the date on which the user's account will no longer be
accessible. The date is expressed in the format YYYY-MM-DD, or null
to disable the expiry.
A user whose account is locked must contact the system
administrator before being able to use the system again.
'';
};
}; };
config = mkMerge config = mkMerge
@ -438,7 +449,7 @@ let
name uid group description home homeMode createHome isSystemUser name uid group description home homeMode createHome isSystemUser
password passwordFile hashedPassword password passwordFile hashedPassword
autoSubUidGidRange subUidRanges subGidRanges autoSubUidGidRange subUidRanges subGidRanges
initialPassword initialHashedPassword; initialPassword initialHashedPassword expires;
shell = utils.toShellPath u.shell; shell = utils.toShellPath u.shell;
}) cfg.users; }) cfg.users;
groups = attrValues cfg.groups; groups = attrValues cfg.groups;
@ -637,7 +648,7 @@ in {
install -m 0700 -d /root install -m 0700 -d /root
install -m 0755 -d /home install -m 0755 -d /home
${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \ ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON p.DateTime ])}/bin/perl \
-w ${./update-users-groups.pl} ${spec} -w ${./update-users-groups.pl} ${spec}
''; '';
}; };

View File

@ -43,6 +43,8 @@ let
"-/etc/nsswitch.conf" "-/etc/nsswitch.conf"
"-/etc/hosts" "-/etc/hosts"
"-/etc/localtime" "-/etc/localtime"
"-/etc/ssl/certs"
"-/etc/static/ssl/certs"
"-/run/postgresql" "-/run/postgresql"
] ++ (optional enableRedis redisServer.unixSocket); ] ++ (optional enableRedis redisServer.unixSocket);
BindPaths = [ BindPaths = [

View File

@ -831,6 +831,7 @@ in {
uptime-kuma = handleTest ./uptime-kuma.nix {}; uptime-kuma = handleTest ./uptime-kuma.nix {};
usbguard = handleTest ./usbguard.nix {}; usbguard = handleTest ./usbguard.nix {};
user-activation-scripts = handleTest ./user-activation-scripts.nix {}; user-activation-scripts = handleTest ./user-activation-scripts.nix {};
user-expiry = runTest ./user-expiry.nix;
user-home-mode = handleTest ./user-home-mode.nix {}; user-home-mode = handleTest ./user-home-mode.nix {};
uwsgi = handleTest ./uwsgi.nix {}; uwsgi = handleTest ./uwsgi.nix {};
v2ray = handleTest ./v2ray.nix {}; v2ray = handleTest ./v2ray.nix {};

View File

@ -0,0 +1,70 @@
let
alice = "alice";
bob = "bob";
eve = "eve";
passwd = "pass1";
in
{
name = "user-expiry";
nodes = {
machine = {
users.users = {
${alice} = {
initialPassword = passwd;
isNormalUser = true;
expires = "1990-01-01";
};
${bob} = {
initialPassword = passwd;
isNormalUser = true;
expires = "2990-01-01";
};
${eve} = {
initialPassword = passwd;
isNormalUser = true;
};
};
};
};
testScript = ''
def switch_to_tty(tty_number):
machine.fail(f"pgrep -f 'agetty.*tty{tty_number}'")
machine.send_key(f"alt-f{tty_number}")
machine.wait_until_succeeds(f"[ $(fgconsole) = {tty_number} ]")
machine.wait_for_unit(f"getty@tty{tty_number}.service")
machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{tty_number}'")
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("getty@tty1.service")
with subtest("${alice} cannot login"):
machine.wait_until_tty_matches("1", "login: ")
machine.send_chars("${alice}\n")
machine.wait_until_tty_matches("1", "Password: ")
machine.send_chars("${passwd}\n")
machine.wait_until_succeeds("journalctl --grep='account ${alice} has expired \\(account expired\\)'")
machine.wait_until_tty_matches("1", "login: ")
with subtest("${bob} can login"):
switch_to_tty(2)
machine.wait_until_tty_matches("2", "login: ")
machine.send_chars("${bob}\n")
machine.wait_until_tty_matches("2", "Password: ")
machine.send_chars("${passwd}\n")
machine.wait_until_succeeds("pgrep -u ${bob} bash")
with subtest("${eve} can login"):
switch_to_tty(3)
machine.wait_until_tty_matches("3", "login: ")
machine.send_chars("${eve}\n")
machine.wait_until_tty_matches("3", "Password: ")
machine.send_chars("${passwd}\n")
machine.wait_until_succeeds("pgrep -u ${eve} bash")
'';
}

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "felix"; pname = "felix";
version = "2.8.0"; version = "2.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyoheiu"; owner = "kyoheiu";
repo = "felix"; repo = "felix";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-d01AbHAIelwjVnVX5hn4QY0sp9n9Ez4ImYqNO/RBmEU="; hash = "sha256-RDCX5+Viq/VRb0SXUYxCtWF+aVahI5WGhp9/Vn+uHqI=";
}; };
cargoHash = "sha256-n8cVdGvh3/lQ6pF0ukxsog+XpIdpjuxGcgkDkM/3IFk="; cargoHash = "sha256-kgI+afly+/Ag0witToM95L9b3yQXP5Gskwl4Lf4SusY=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec {
"--skip=state::tests::test_has_write_permission" "--skip=state::tests::test_has_write_permission"
]; ];
# Cargo.lock is outdated
postConfigure = ''
cargo metadata --offline
'';
meta = with lib; { meta = with lib; {
description = "A tui file manager with vim-like key mapping"; description = "A tui file manager with vim-like key mapping";
homepage = "https://github.com/kyoheiu/felix"; homepage = "https://github.com/kyoheiu/felix";

View File

@ -14,13 +14,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "denaro"; pname = "denaro";
version = "2023.6.2"; version = "2023.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NickvisionApps"; owner = "NickvisionApps";
repo = "Denaro"; repo = "Denaro";
rev = version; rev = version;
hash = "sha256-wnqk+UuOQc/Yph9MbQU8FRsNC/8ZQ9FxgF205pdHf+s="; hash = "sha256-wq5dwSgfmEHy38LPjWOE+J+prjIYy2z4Hezq/45Ddjk=";
}; };
dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-sdk = dotnetCorePackages.sdk_7_0;
@ -54,6 +54,7 @@ buildDotnetModule rec {
gtk4 gtk4
libadwaita libadwaita
glib # Fixes "Could not retrieve parent type - is the typeid valid?" glib # Fixes "Could not retrieve parent type - is the typeid valid?"
gdk-pixbuf
]; ];
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;

View File

@ -2,33 +2,43 @@
# Please dont edit it manually, your changes might get overwritten! # Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [ { fetchNuGet }: [
(fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; sha256 = "0gjacqdgnh1d40sm9vrdb8vr6jv3vyh6j265gj1aaf9af2569637"; }) (fetchNuGet { pname = "Cake.Tool"; version = "3.1.0"; sha256 = "1kv9zz0qsx40wiygydw5z6vkj8hfayvgy9bsii2lamdas9z0vmbc"; })
(fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; }) (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; })
(fetchNuGet { pname = "FuzzySharp"; version = "2.0.2"; sha256 = "1xq3q4s9d5p1yn4j91a90hawk9wcrz1bl6zj9866y01yx9aamr8s"; })
(fetchNuGet { pname = "GetText.NET"; version = "1.8.7"; sha256 = "0djn5sc7p33ayjmxmxs4hqagh51bg70wqs6mwbhlhsrc67bvgj9a"; }) (fetchNuGet { pname = "GetText.NET"; version = "1.8.7"; sha256 = "0djn5sc7p33ayjmxmxs4hqagh51bg70wqs6mwbhlhsrc67bvgj9a"; })
(fetchNuGet { pname = "GirCore.Adw-1"; version = "0.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; }) (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.4.0"; sha256 = "1wy780mwvl7n1kr85r2icwsz9p3vsw749603x0wm3ka5ywbzv91k"; })
(fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; }) (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.4.0"; sha256 = "11rg8hgran23b4m1116sfvfss0fgz874imafrv3h9w7c76f6hhci"; })
(fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.3.0"; sha256 = "1bc78409bdhfqqbirwr1lkzxl27adndv05q5fcm5sivmlzr7fbkm"; }) (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.4.0"; sha256 = "101qr6kijslzqd6dcmpjzrbdp8nr6ibi8958frvkpxifqa4xyp4c"; })
(fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.3.0"; sha256 = "1dz7f29jbmkzcwbggjwsx6r4nmw5xvvyfmia0xpjvpx1zzmfvmc4"; }) (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.4.0"; sha256 = "1bws3zry4awy73lwzllbdljl8wybmxfm870m175wl38c7pa18sav"; })
(fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.3.0"; sha256 = "1jgwhqghg14z5qkgakd42dnyk6n8cj7nkgf0hbj9zxbd0my9vv6p"; }) (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.4.0"; sha256 = "05maiqg2qxsg56zb8zamv241gqkskli8laa7i0dxl3f93ddc78f6"; })
(fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.3.0"; sha256 = "0hv55x8snr4fk0z8dn52n8p030f02i3gfysin0bsrlmi879gn9ln"; }) (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.4.0"; sha256 = "1gy8gx7vy070nc2afj1zsn3d004y9d3gwn7zdj9g2fbhavbc4snk"; })
(fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.3.0"; sha256 = "1aibc13yb96bbirh25jv5gp0cqvz1ya9drrdhirfsrn41274ikpm"; }) (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.4.0"; sha256 = "05q00p06kn97143az2xi5zhfpi30qqcds1n1zfj87gi5w0jla4ib"; })
(fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.3.0"; sha256 = "1xd4yfppr34ngmal3s16f08mqdn7mra97jmjpk13aa9yjbp0avij"; }) (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.4.0"; sha256 = "06vrkjyzj4rjvlni3ixj12zpky2mah8v1q8nbbkfwca08k5hdz7p"; })
(fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.3.0"; sha256 = "065fg5dj97sidrr7n2a6gv8vmylhpfznhw3zazra6krcvzgf1gcz"; }) (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.4.0"; sha256 = "06b2c35ynmkknk5zbhs75081dki0zm165xa659mg8i88cyxsgrh4"; })
(fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.3.0"; sha256 = "1r68lfxj98y3fvcxl33lk2cbjz7dn9grqb6c5axdlfjjgnkwjvlj"; }) (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.4.0"; sha256 = "1hwmd3j4gllzjwkqq3m4wbl3v7hh2nsa7i1d2ziw3fvgbnbnb1vi"; })
(fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.3.0"; sha256 = "0c9im9sbiqsykrj4yq93x5nlsj9c5an7dj1j6yirb874zqq6jhsp"; }) (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.4.0"; sha256 = "1r8hkr7vm32cjmw092l67kaysqa5jzyn7v518502nljlm9ivil6f"; })
(fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.3.0"; sha256 = "12nva0xzykvf102m69gn19ap1cyiap3i93n9gha9pnl4d5g4b4k1"; }) (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.4.0"; sha256 = "1wyq9s18gfs73z01gaqm87i7h71ir2n0jz1dyi26hj6b3qp0p34a"; })
(fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.3.0"; sha256 = "1waiqs52gmpfqxc7yfdz7lp4jr3462js8hrs6acfr47vzddksymi"; }) (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.4.0"; sha256 = "0qifms5nlljzccgzvnyx5vcdgvfdyp2q7s0zdglay5x5g4zrl8fv"; })
(fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.4.0"; sha256 = "1vn8bgi9ijnw25id5vis15gv9h0d4y03scr4jv03scisv411jrl8"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.4-preview.84"; sha256 = "1kk2ja6lsfmx00sliniyky9fimrk9pcq2ql7j72310kx3qaad45v"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.4-preview.84"; sha256 = "0q5nmqhvdyg112c6q5h2h407d11g7sickbrn3fc5036n7svij13z"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.4-preview.84"; sha256 = "1jkkjj2p8wiabc6m5m88kf1ykq5wdjihyn27279mvw8vyrp4zp5d"; })
(fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; }) (fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; })
(fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-beta.910"; sha256 = "0yw54yd1kp4j8js1g405m4lvv84zx4zkx4m64iiqsc765a4alvvy"; })
(fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-beta.910"; sha256 = "1ifhvcsa0319mip98xbmlib3k7fkn24igfxxyfi2d31rajqv970r"; })
(fetchNuGet { pname = "Markdig"; version = "0.31.0"; sha256 = "0iic44i47wp18jbbpl44iifhj2mfnil9gakkw3bzp7zif3rhl19m"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.5"; sha256 = "11gkdlf2apnzvwfd7bxdhjvb4qd0p2ridp4rrz44f7h76x1sb0gk"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.5"; sha256 = "11gkdlf2apnzvwfd7bxdhjvb4qd0p2ridp4rrz44f7h76x1sb0gk"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "Nickvision.Aura"; version = "2023.8.8"; sha256 = "0l8khkg0df26dqra26wl74s73cxidbqw3k5l7jv0579gvkkv9893"; })
(fetchNuGet { pname = "Nickvision.GirExt"; version = "2023.7.3"; sha256 = "1ahf4mld9khk2gaja30zfcjmhclz2l2nims0q4l7jk2nm9p7rzi9"; })
(fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; }) (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; })
(fetchNuGet { pname = "PdfSharpCore"; version = "1.3.56"; sha256 = "0a01b2a14gygh25rq3509rky85331l8808q052br2fzidhb2vc10"; }) (fetchNuGet { pname = "PdfSharpCore"; version = "1.3.56"; sha256 = "0a01b2a14gygh25rq3509rky85331l8808q052br2fzidhb2vc10"; })
(fetchNuGet { pname = "QuestPDF"; version = "2023.5.1"; sha256 = "1yfjwb7aj975aars7mcp1dxvarxl8aq122bndpw808b4cx3058gl"; }) (fetchNuGet { pname = "QuestPDF"; version = "2023.5.1"; sha256 = "1yfjwb7aj975aars7mcp1dxvarxl8aq122bndpw808b4cx3058gl"; })
@ -53,10 +63,14 @@
(fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta17"; sha256 = "1qm8q82wzj54nbv63kx3ybln51k47sl18hia3jnzk1zrb6wdsw9a"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta17"; sha256 = "1qm8q82wzj54nbv63kx3ybln51k47sl18hia3jnzk1zrb6wdsw9a"; })
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.4-preview.84"; sha256 = "1isyjmmfqzbvqiypsvvnqrwf6ifr2ypngzvzj41m5nbk1jr8nn6m"; })
(fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; })
(fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.4-preview.84"; sha256 = "132n0sq2fjk53mc89yx6qn20w194145sv9367s623di7ysz467br"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.4-preview.84"; sha256 = "0vqwc2wh8brzn99cc61qgcyf3gd8vqlbdkjcmc3bcb07bc8k16v7"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.4-preview.84"; sha256 = "0m48d87cp2kvrhxvykxnhbzgm7xrw8jkdagvma80bag5gzdiicy2"; })
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.5"; sha256 = "0xnzpkhm9z09yay76wxgn4j8js260pansx8r10lrksxv2b4b0n4x"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.5"; sha256 = "0xnzpkhm9z09yay76wxgn4j8js260pansx8r10lrksxv2b4b0n4x"; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.5"; sha256 = "03181hahmxv8jlaikx0nkzfc2q1l1cdp3chgx5q6780nhqyjkhhx"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.5"; sha256 = "03181hahmxv8jlaikx0nkzfc2q1l1cdp3chgx5q6780nhqyjkhhx"; })
@ -120,4 +134,5 @@
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
(fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; sha256 = "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"; })
] ]

View File

@ -41,9 +41,9 @@
version = "2023-06-09"; version = "2023-06-09";
}; };
}; };
sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; sha256 = "1afr0shzsxfi72xypr33r9y4rps1yfx9qf1f9pyjz5x4l5wz8pp8";
sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; sha256bin64 = "08hqymyzah1wiyag56iivvydy1zph4jzicjjjyh6br07lpfps7nk";
version = "116.0.5845.96"; version = "116.0.5845.110";
}; };
ungoogled-chromium = { ungoogled-chromium = {
deps = { deps = {
@ -54,12 +54,12 @@
version = "2023-06-09"; version = "2023-06-09";
}; };
ungoogled-patches = { ungoogled-patches = {
rev = "116.0.5845.96-1"; rev = "116.0.5845.110-1";
sha256 = "14smm0vmqzn2664qdbv7asm8n2gg88zcvwrjpsn54qwk0njv7zlr"; sha256 = "1dj8zjnd105lmrfb033hgcvw3a2jaxlp97aqnj0wzx6jw7q9y4p1";
}; };
}; };
sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; sha256 = "1afr0shzsxfi72xypr33r9y4rps1yfx9qf1f9pyjz5x4l5wz8pp8";
sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; sha256bin64 = "08hqymyzah1wiyag56iivvydy1zph4jzicjjjyh6br07lpfps7nk";
version = "116.0.5845.96"; version = "116.0.5845.110";
}; };
} }

View File

@ -12,9 +12,9 @@
buildGoModule rec { buildGoModule rec {
pname = "minikube"; pname = "minikube";
version = "1.31.1"; version = "1.31.2";
vendorHash = "sha256-7Wa5Ut3n+CH4LeyRKvFC2aRf2auQXfqsi54QLKWgak8="; vendorHash = "sha256-5ChPdSIRI+Q3OLW+joukMpIFbUjU4TKpXT4wAARVVP8=";
doCheck = false; doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes"; owner = "kubernetes";
repo = "minikube"; repo = "minikube";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6vCZUDH35OclO02sV+AXv8+bj4klwoZC0abotheHSoU="; sha256 = "sha256-Ha0liXc2oXJ3dLty1veN5xN5BUKIiNXe8NTGqWDbTD0=";
}; };
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];

View File

@ -1115,11 +1115,11 @@
"vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc="
}, },
"tencentcloud": { "tencentcloud": {
"hash": "sha256-9nm4x3pBHvUDyMWUZpxqbSOc4uxGZ50lKBwf8PV9UAQ=", "hash": "sha256-OA/GnrdOv9gbnGESdMdw7sc9kRcWI4A6A79ZLOQzyJU=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack", "owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud", "repo": "terraform-provider-tencentcloud",
"rev": "v1.81.21", "rev": "v1.81.22",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },

View File

@ -5,18 +5,18 @@
buildGoModule rec { buildGoModule rec {
pname = "storj-uplink"; pname = "storj-uplink";
version = "1.85.1"; version = "1.86.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "storj"; owner = "storj";
repo = "storj"; repo = "storj";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-WfV7n4AgZoD8rOd6UVBFRqOz9qs1frjSGLUhjxqTG08="; hash = "sha256-peWcgME+OCa9feNKLtTmZIGCpNxl+EdQfYDXV2BbclI=";
}; };
subPackages = [ "cmd/uplink" ]; subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-EkB8GjWtOO3Yi0PFFE8G8swwzYmw6D6LDO24vnSrkLs="; vendorHash = "sha256-sBez/IQzRIGQdOXr4Ikxh+dT8IQxtbxau5vo9VqGJvE=";
meta = with lib; { meta = with lib; {
description = "Command-line tool for Storj"; description = "Command-line tool for Storj";

View File

@ -19,13 +19,13 @@
}: }:
let let
version = "1.17.0"; version = "1.17.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paperless-ngx"; owner = "paperless-ngx";
repo = "paperless-ngx"; repo = "paperless-ngx";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Zv+5DMviBGyc24R+qcAlvjko7wH+Gturvw5nzFJlIfk="; hash = "sha256-/0Ml3NRTghqNykB1RZfqDW9TtENnSRM7wqG7Vn4Kl04=";
}; };
# Use specific package versions required by paperless-ngx # Use specific package versions required by paperless-ngx
@ -51,7 +51,7 @@ let
pname = "paperless-ngx-frontend"; pname = "paperless-ngx-frontend";
inherit version src; inherit version src;
npmDepsHash = "sha256-J8oUDvcJ0fawTv9L1B9hw8l47UZvOCj16jUF+83W8W8="; npmDepsHash = "sha256-6EvC9Ka8gl0eRgJtHooB3yQNVGYzuH/WRga4AtzQ0EY=";
nativeBuildInputs = [ nativeBuildInputs = [
python3 python3
@ -248,6 +248,7 @@ python.pkgs.buildPythonApplication rec {
pytest-django pytest-django
pytest-env pytest-env
pytest-httpx pytest-httpx
pytest-rerunfailures
pytest-xdist pytest-xdist
pytestCheckHook pytestCheckHook
reportlab reportlab

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "abracadabra"; pname = "abracadabra";
version = "2.2.2"; version = "2.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KejPi"; owner = "KejPi";
repo = "AbracaDABra"; repo = "AbracaDABra";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-VFV2eHBvBdKrI4Zt+GCtAOSZt0++hYDWYR7AN42p85I="; sha256 = "sha256-gpZ6ckV//fhDlpAqmMwL4XNXX7xFmGi58fkOC4oRcDM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -24,15 +24,15 @@
}: }:
let let
id = "118976581"; id = "123097753";
in in
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "multiviewer-for-f1"; pname = "multiviewer-for-f1";
version = "1.24.2"; version = "1.26.1";
src = fetchurl { src = fetchurl {
url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
sha256 = "sha256-zll639fQFdrNvIj/4ECqEGxQw4VgfERGlti7opSmSi0="; sha256 = "sha256-VS1oDqib0XCEVDVt72GGz1ikwZJYnn6enAylh54PrDI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -5,16 +5,21 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "workstyle"; pname = "workstyle";
version = "unstable-2021-05-09"; version = "unstable-2023-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pierrechevalier83"; owner = "pierrechevalier83";
repo = pname; repo = pname;
rev = "f2023750d802259ab3ee7d7d1762631ec157a0b1"; rev = "8bde72d9a9dd67e0fc7c0545faca53df23ed3753";
sha256 = "04xds691sw4pi2nq8xvdhn0312wwia60gkd8b1bjqy11zrqbivbx"; sha256 = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU=";
}; };
cargoSha256 = "0xwv8spr96z4aimjlr15bhwl6i3zqp7jr45d9zr3sbi9d8dbdja2"; cargoLock = {
lockFile = ./workstyle-Cargo.lock;
outputHashes = {
"swayipc-3.0.1" = "sha256-3Jhz3+LhncSRvo3n7Dh5d+RWQSvEff9teuaDZLLLEHk=";
};
};
doCheck = false; # No tests doCheck = false; # No tests

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle"; pname = "numix-icon-theme-circle";
version = "23.08.09"; version = "23.08.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "numixproject"; owner = "numixproject";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-YLr5WQox1TzGxRZGJf7NzFRhkNIPJaYFyOYwp9MfkDQ="; sha256 = "sha256-FXWue9CiX2zh7FXLnlG+SOto2Z4oznWNYpgZlMvVGn4=";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];

View File

@ -17,13 +17,13 @@
assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "trealla"; pname = "trealla";
version = "2.24.21"; version = "2.25.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trealla-prolog"; owner = "trealla-prolog";
repo = "trealla"; repo = "trealla";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-zpHdZiDtNcQko+gn92fiGWSvYT4aQ4t6nYFwf6zu0cA="; hash = "sha256-3NBrJFSTcjftvTYn26SMeU2HtR81J2qlDAwAZRdis4M=";
}; };
postPatch = '' postPatch = ''

View File

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wasmtime"; pname = "wasmtime";
version = "12.0.0"; version = "12.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bytecodealliance"; owner = "bytecodealliance";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6bbz8FH87MahD3R7G3cmsJD0461L4OoCbFejyXsuER0="; hash = "sha256-4h+c5ke4MZuIMiCaLBt6RsRe9PWAn6VqW2Z6Wnh7X30=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoHash = "sha256-QbKYnKdJK9zImZDl057l8/Za4A+N82WrqQCzrOsc6fE="; cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];

View File

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "wazero"; pname = "wazero";
version = "1.4.0"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tetratelabs"; owner = "tetratelabs";
repo = "wazero"; repo = "wazero";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Yn5mg/K+RT6CoW1vMrpvRFOao83IAZE1mP+DGp4SmKk="; hash = "sha256-iUPAVOmZNX4qs7bHu9dXtQP/G8FwyblJvZ3pauA9ev0=";
}; };
vendorHash = null; vendorHash = null;
@ -46,5 +46,6 @@ buildGoModule rec {
changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}"; changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ figsoda ]; maintainers = with maintainers; [ figsoda ];
mainProgram = "wazero";
}; };
} }

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imgui"; pname = "imgui";
version = "1.89.7"; version = "1.89.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocornut"; owner = "ocornut";
repo = "imgui"; repo = "imgui";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs="; sha256 = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo=";
}; };
dontBuild = true; dontBuild = true;

View File

@ -53,6 +53,12 @@ buildPythonPackage rec {
redis redis
]; ];
# requires network
disabledTests = [
"test_download_file_404"
"test_download_404"
];
pythonImportsCheck = [ "aiogram" ]; pythonImportsCheck = [ "aiogram" ];
meta = with lib; { meta = with lib; {

View File

@ -7,6 +7,7 @@
, publicsuffix2 , publicsuffix2
, pythonOlder , pythonOlder
, pytestCheckHook , pytestCheckHook
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -28,6 +29,7 @@ buildPythonPackage rec {
dnspython dnspython
dkimpy dkimpy
publicsuffix2 publicsuffix2
setuptools
]; ];
nativeCheckInputs = [ nativeCheckInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dj-database-url"; pname = "dj-database-url";
version = "2.0.0"; version = "2.1.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-o1qfD0N3XKb5DYGdxFYjPve8x2tHN31dkIt1x+syBiQ="; hash = "sha256-8gQs7+EIblOcnaOfrVrX9hFzv3lmXmm/fk3lX6iLE18=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "djangorestframework-dataclasses"; pname = "djangorestframework-dataclasses";
version = "1.2.0"; version = "1.3.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oxan"; owner = "oxan";
repo = "djangorestframework-dataclasses"; repo = "djangorestframework-dataclasses";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; hash = "sha256-aUz+f8Q7RwQsoRpjq1AAmNtDzTA6KKxyc+MtBJEfyL8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,19 +2,24 @@
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, setuptools , setuptools
, requests , aiofiles
, click , click
, h2
, httpx
, lxml
, requests
, socksio
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "duckduckgo-search"; pname = "duckduckgo-search";
version = "2.8.5"; version = "3.8.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deedy5"; owner = "deedy5";
repo = "duckduckgo_search"; repo = "duckduckgo_search";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-UXh3+kBfkylt5CIXbYTa/vniEETUvh4steUrUg5MqYU="; hash = "sha256-FOGMqvr5+O3+UTdM0m1nJBAcemP6hpAOXv0elvnCUHU=";
}; };
format = "pyproject"; format = "pyproject";
@ -22,9 +27,16 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
requests aiofiles
click click
]; h2
httpx
lxml
requests
socksio
] ++ httpx.optional-dependencies.brotli
++ httpx.optional-dependencies.http2
++ httpx.optional-dependencies.socks;
pythonImportsCheck = [ "duckduckgo_search" ]; pythonImportsCheck = [ "duckduckgo_search" ];

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mkdocstrings-python"; pname = "mkdocstrings-python";
version = "1.5.0"; version = "1.5.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mkdocstrings"; owner = "mkdocstrings";
repo = "python"; repo = "python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-Z92w84JI7tzARHNdVZvOrMHFbMLUayf6uHak++C0suc="; hash = "sha256-jfwyIx43s/zmIVOTDSIiQ8EYHUEHwRTwEa2SAfWy7HM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -4,7 +4,6 @@
, ansible-compat , ansible-compat
, ansible-core , ansible-core
, click-help-colors , click-help-colors
, cookiecutter
, enrich , enrich
, jsonschema , jsonschema
, withPlugins ? true, molecule-plugins , withPlugins ? true, molecule-plugins
@ -13,29 +12,30 @@
, rich , rich
, setuptools , setuptools
, yamllint , yamllint
, wcmatch
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "molecule"; pname = "molecule";
version = "5.1.0"; version = "6.0.1";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-+nr4n9+TF1OcPsqZyx5edSLXpX4LZ/W2mORCdvmNnYI="; hash = "sha256-ssARHVtEp3pW7364WhxhtHAWW5fRFXiioWgEczTI3yM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
ansible-compat ansible-compat
ansible-core ansible-core
click-help-colors click-help-colors
cookiecutter
enrich enrich
jsonschema jsonschema
packaging packaging
pluggy pluggy
rich rich
yamllint yamllint
wcmatch
] ++ lib.optional withPlugins molecule-plugins; ] ++ lib.optional withPlugins molecule-plugins;
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,12 +9,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "molecule-plugins"; pname = "molecule-plugins";
version = "23.4.1"; version = "23.5.0";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-NMR+4sEcNbowyoTqaEwe4Wac9+WNIZesnb/L9C0KG3s="; hash = "sha256-8T6gR7hlDIkmBLgbdjgryAu0riXqULI/MOgf2dWAKv8=";
}; };
# reverse the dependency # reverse the dependency

View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycmarkgfm"; pname = "pycmarkgfm";
version = "1.2.0"; version = "1.2.1";
format = "setuptools"; format = "setuptools";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps="; hash = "sha256-oPklCB54aHn33ewTiSlXgx38T0RzLure5OzGuFwsLNo=";
}; };
propagatedNativeBuildInputs = [ cffi ]; propagatedNativeBuildInputs = [ cffi ];

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "argc"; pname = "argc";
version = "1.8.0"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sigoden"; owner = "sigoden";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xuSoTTtULVdG1LZFiEPYYuwJxG7FdN9vY+7K7OmfWZI="; hash = "sha256-BM9MXokVXA5EJwr8F7Wg5LTE1xhmj9ttVXOMNJx0RRw=";
}; };
cargoHash = "sha256-BJaVaOBCLH5c7/DrsOq6uVN02wEfLA7k+FgxCBmOUTA="; cargoHash = "sha256-SScCPBERXScYJ9LlPcbIhwCikRum0F1tU3gZYaQRFTo=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "bazelisk"; pname = "bazelisk";
version = "1.17.0"; version = "1.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-F3paYKK+L5mBCQvlusKlSBS1X9fVSDHFw1Ujiyo5yrc="; sha256 = "sha256-NZDdSIXNQFSCoav+YN1VLFrHQSKZfoZDp2TWXtmQC6o=";
}; };
vendorHash = "sha256-V1GKZPLBjFhl0F0AvUC6MfAsrZsVToSZU3K2/hwOCVs="; vendorHash = "sha256-oYagIEb/u/XCTbZkvynxcOtORhW75hReinrVAkdOApM=";
doCheck = false; doCheck = false;
@ -23,6 +23,7 @@ buildGoModule rec {
BEWARE: This package does not work on NixOS. BEWARE: This package does not work on NixOS.
''; '';
homepage = "https://github.com/bazelbuild/bazelisk"; homepage = "https://github.com/bazelbuild/bazelisk";
changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ elasticdog ]; maintainers = with maintainers; [ elasticdog ];
}; };

View File

@ -5,22 +5,27 @@
buildGoModule rec { buildGoModule rec {
pname = "bazel-remote"; pname = "bazel-remote";
version = "2.4.1"; version = "2.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "buchgr"; owner = "buchgr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7zAeGJyMfMdrVDCuTWU3zikXjM/ydjnGj6Ctjckd32c="; hash = "sha256-bXXEvTmzsFH0dt/p26gF9XnSgFulNIiIl3lxJRyUJMg=";
}; };
vendorHash = "sha256-SxGBfWcV10L6xC5XPIfv/HJWQy5g3AoV8z4/ae23DEc="; vendorHash = "sha256-0rmqsUMwk5ytAZc94JzvZTuh0WAmQwBEWSE96yNALE0=";
subPackages = [ "." ];
doCheck = false; doCheck = false;
ldflags = [ "-s" "-w" "-X main.gitCommit=${version}" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/buchgr/bazel-remote"; homepage = "https://github.com/buchgr/bazel-remote";
description = "A remote HTTP/1.1 cache for Bazel"; description = "A remote HTTP/1.1 cache for Bazel";
changelog = "https://github.com/buchgr/bazel-remote/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = lib.teams.bazel.members; maintainers = lib.teams.bazel.members;
platforms = platforms.darwin ++ platforms.linux; platforms = platforms.darwin ++ platforms.linux;

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "bazel-buildtools"; pname = "bazel-buildtools";
version = "6.3.2"; version = "6.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = "buildtools"; repo = "buildtools";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-K0MJQYzWkryrO7jjx16UMq7CGRasWF40WUWRtroW6ME="; hash = "sha256-eGX1W3Nc26aw31dWm1hvcUzFh1efL4Vd86dK6Hs2BJc=";
}; };
vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A=";

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kafkactl"; pname = "kafkactl";
version = "3.1.0"; version = "3.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deviceinsight"; owner = "deviceinsight";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-H6oSkPQx5bk9VBBoeGVg0Ri5LTCv96tR4Vq4guymAbQ="; hash = "sha256-Rehf0mbdHgfjcsRKYCAqaUKsys3rRZFJxwHk2h/aICM=";
}; };
vendorHash = "sha256-Y3BPt3PsedrlCoKiKUObf6UQd+MuNiCGLpJUg94XSgA="; vendorHash = "sha256-5LHL0L7xTmy3yBs7rtrC1uvUjLKBU8LpjQaHyeRyFhw=";
doCheck = false; doCheck = false;

View File

@ -812,7 +812,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]] [[package]]
name = "flake8-to-ruff" name = "flake8-to-ruff"
version = "0.0.285" version = "0.0.286"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -876,8 +876,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"js-sys",
"libc", "libc",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
] ]
[[package]] [[package]]
@ -2064,7 +2066,7 @@ dependencies = [
[[package]] [[package]]
name = "ruff" name = "ruff"
version = "0.0.285" version = "0.0.286"
dependencies = [ dependencies = [
"annotate-snippets 0.9.1", "annotate-snippets 0.9.1",
"anyhow", "anyhow",
@ -2128,6 +2130,7 @@ dependencies = [
"typed-arena", "typed-arena",
"unicode-width", "unicode-width",
"unicode_names2", "unicode_names2",
"uuid",
"wsl", "wsl",
] ]
@ -2164,7 +2167,7 @@ dependencies = [
[[package]] [[package]]
name = "ruff_cli" name = "ruff_cli"
version = "0.0.285" version = "0.0.286"
dependencies = [ dependencies = [
"annotate-snippets 0.9.1", "annotate-snippets 0.9.1",
"anyhow", "anyhow",
@ -2340,6 +2343,7 @@ dependencies = [
"insta", "insta",
"is-macro", "is-macro",
"itertools", "itertools",
"memchr",
"once_cell", "once_cell",
"ruff_formatter", "ruff_formatter",
"ruff_python_ast", "ruff_python_ast",
@ -2399,6 +2403,7 @@ dependencies = [
"ruff_text_size", "ruff_text_size",
"rustc-hash", "rustc-hash",
"static_assertions", "static_assertions",
"test-case",
"tiny-keccak", "tiny-keccak",
"unic-emoji-char", "unic-emoji-char",
"unic-ucd-ident", "unic-ucd-ident",
@ -3344,9 +3349,26 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.4.0" version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
"getrandom",
"rand",
"uuid-macro-internal",
"wasm-bindgen",
]
[[package]]
name = "uuid-macro-internal"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.23",
]
[[package]] [[package]]
name = "valuable" name = "valuable"

View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruff"; pname = "ruff";
version = "0.0.285"; version = "0.0.286";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-n5FjzngdVSHHnBpVGFXzPlUAEMx96JqjYqgKwymTMzA="; hash = "sha256-5bMfOju1uJV4+a4UTzaanpzU6PjCSK9HHMdhvKVaNcg=";
}; };
cargoLock = { cargoLock = {

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-binstall"; pname = "cargo-binstall";
version = "1.2.1"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cargo-bins"; owner = "cargo-bins";
repo = "cargo-binstall"; repo = "cargo-binstall";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xqY1C3ZPGY9GeyuSgV0s4+eSkm4r+jOQkNgSzqE2QUI="; hash = "sha256-uT8nSsC8QstjbyO5Ve2jSug3Bd/DuUNoGzquDPVl++o=";
}; };
cargoHash = "sha256-yAda80b62WGYuKo5YtCLRtx08fmNs5HLDcNWhq+FG/I="; cargoHash = "sha256-rxQKU73ANokxLb42u3Zom+5Wbv/ayiQJaM9NsTWW8fU=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-cov"; pname = "cargo-llvm-cov";
version = "0.5.30"; version = "0.5.31";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-35tpMLVBLwm1aEqznUniv7J/D77CosllpgpeYsglvcs="; sha256 = "sha256-HjnP9H1t660PJ5eXzgAhrdDEgqdzzb+9Dbk5RGUPjaQ=";
}; };
cargoSha256 = "sha256-7E6Biveh+fBEtQhJW346Pakimc0tTacHcSvKSJusyFs="; cargoSha256 = "sha256-p6zpRRNX4g+jESNSwouWMjZlFhTBFJhe7LirYtFrZ1g=";
# skip tests which require llvm-tools-preview # skip tests which require llvm-tools-preview
checkFlags = [ checkFlags = [

View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "specr-transpile"; pname = "specr-transpile";
version = "0.1.22"; version = "0.1.24";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-D3UdQ3L7fSSFWlVSjqjEUqNCQebMHOtZnJqO7sBjm14="; hash = "sha256-+7NjB87pfFh8472gOV4HoKIqSiHnTCFOEVdKYBsn1qg=";
}; };
cargoHash = "sha256-f0Gwxr7J56Q11Rv26mycCYbCidr5bXUwo4kmnVWMCz4="; cargoHash = "sha256-VgEyXm1uSsNJVjUYx66A35vLNxYErTrC8qBhYVlYyH4=";
meta = with lib; { meta = with lib; {
description = "Converts Specr lang code to Rust"; description = "Converts Specr lang code to Rust";

View File

@ -5,16 +5,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "turso-cli"; pname = "turso-cli";
version = "0.79.0"; version = "0.80.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tursodatabase"; owner = "tursodatabase";
repo = "turso-cli"; repo = "turso-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-5ucStAFe3lZgnGMI0fRw1E4T60+9nglNbZnzrjRmRgk="; hash = "sha256-Q0H9Wq0QMh6rrEpfVdrU+e1wpcu1qE6t5d2PUBGsxRQ=";
}; };
vendorHash = "sha256-+F9I6+f7Sm5qhBAoXCMKjV/jFY0fyVIk0NKBQNNI+qM="; vendorHash = "sha256-VbekKkS7cHe29O/YKIlxZ+BU9XSRlsBL06AKi2WelCs=";
# Test_setDatabasesCache fails due to /homeless-shelter: read-only file system error. # Test_setDatabasesCache fails due to /homeless-shelter: read-only file system error.
doCheck = false; doCheck = false;

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "vendir"; pname = "vendir";
version = "0.34.3"; version = "0.34.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vmware-tanzu"; owner = "vmware-tanzu";
repo = "carvel-vendir"; repo = "carvel-vendir";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-oeKzbe272Mg0pp+MW6/oBw64/OAzTSmo1qSNAoRqmOE="; sha256 = "sha256-HdKMPXZIz1n8+170E3Aj7BYquVGgnPwRKJ5CZcqN35M=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -11,7 +11,7 @@
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
version = "0.8.0"; version = "0.8.1";
pname = "bun"; pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -35,19 +35,19 @@ stdenvNoCC.mkDerivation rec {
sources = { sources = {
"aarch64-darwin" = fetchurl { "aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
hash = "sha256-fJwzGgPzBQeV80Btl16N8zDnmcWq60EUbs0IkpLLgtA="; hash = "sha256-R0+2MevBE98WNsjGsfBrMJyvc0jadLQ9lJIvoekGiBk=";
}; };
"aarch64-linux" = fetchurl { "aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
hash = "sha256-C/JlybeZ1daTBWCAtKcxmN90QSDvII+YuX5/UU/aTL4="; hash = "sha256-fdn3yEavJUEwcUiyr9vd/0yVzkuJLwTvVeIaLcZkKhs=";
}; };
"x86_64-darwin" = fetchurl { "x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
hash = "sha256-4VZ5VgwtKQgAoky0zWDjEV3Nk5nMnD018Q2kJYCMc9c="; hash = "sha256-dGu06A/6d/OtyXcmJCVZsODkLIvP7Zd0w6vnuLWuI1I=";
}; };
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
hash = "sha256-kzlxhUegVmra3zAyF/0KP2Nb9+uIV/UhwlnN2PMenS8="; hash = "sha256-BZ1Ymu2WexC4Ad3cS0Zo9K6WtYL8rlqIYWprk1MyOsg=";
}; };
}; };
updateScript = writeShellScript "update-bun" '' updateScript = writeShellScript "update-bun" ''

View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lilypond"; pname = "lilypond";
version = "2.24.1"; version = "2.24.2";
src = fetchurl { src = fetchurl {
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
sha256 = "sha256-1cWQh1ZKXNbwilK6gOfWUJuRxYXkQ4XcwPo5Jl0YFQk="; sha256 = "sha256-eUTmENe08d5Mccz+H73TIB9U+sVFYb3NBIkU+Nu2Ckg=";
}; };
postInstall = '' postInstall = ''

View File

@ -3,13 +3,13 @@
# Requires the acpi_call kernel module in order to run. # Requires the acpi_call kernel module in order to run.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tpacpi-bat"; pname = "tpacpi-bat";
version = "3.1"; version = "3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "teleshoes"; owner = "teleshoes";
repo = "tpacpi-bat"; repo = "tpacpi-bat";
rev = "v${version}"; rev = "v${version}";
sha256 = "0wbaz34z99gqx721alh5vmpxpj2yxg3x9m8jqyivfi1wfpwc2nd5"; sha256 = "sha256-9XnvVNdgB5VeI3juZfc8N5weEyULXuqu1IDChZfQqFk=";
}; };
buildInputs = [ perl ]; buildInputs = [ perl ];

View File

@ -3,16 +3,16 @@
buildGoModule rec { buildGoModule rec {
pname = "imgproxy"; pname = "imgproxy";
version = "3.18.2"; version = "3.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
hash = "sha256-iMzaeB086VohyzUJqYxdnGi0grosrJD1H0AgK5A75XM="; hash = "sha256-EGnamJBotPDatsWG+XLI/QhF2464aphkB9oS631oj+c=";
rev = "v${version}"; rev = "v${version}";
}; };
vendorHash = "sha256-5o1i88v+1UGYXP2SzyM6seyidrj1Z3Q64w/gi07xf4w="; vendorHash = "sha256-gjRUt8/LECFSU2DG4ALi7a3DxKAGFoW98eBgeE5i2+s=";
nativeBuildInputs = [ pkg-config gobject-introspection ]; nativeBuildInputs = [ pkg-config gobject-introspection ];

View File

@ -39,6 +39,7 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://gitlab.com/mailman/mailman-web";
description = "Django project for Mailman 3 web interface"; description = "Django project for Mailman 3 web interface";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ qyliss m1cr0man ]; maintainers = with maintainers; [ qyliss m1cr0man ];

View File

@ -15,16 +15,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "minio"; pname = "minio";
version = "2023-08-09T23-30-22Z"; version = "2023-08-16T20-17-30Z";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "minio"; owner = "minio";
repo = "minio"; repo = "minio";
rev = "RELEASE.${version}"; rev = "RELEASE.${version}";
sha256 = "sha256-veuqbXJxz7tyj4nZ0sr/kl/m/q2GcLwQBp0AkyvMpQ4="; sha256 = "sha256-VY07ITsR2ISM0V4NgwpayDLakU425JCIjxEJ6YKEzXY=";
}; };
vendorHash = "sha256-12JdaDUIfUpFSxhQuF3ib5bQV3s4qO7MRzQCO2+eQZE="; vendorHash = "sha256-KYbfHYls77OH8IWCnO9dSevrJ+2fZmpRQPCKfKCyXME=";
doCheck = false; doCheck = false;

View File

@ -15,7 +15,7 @@ buildGoModule rec {
srcStatic = fetchurl { srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
hash = "sha256-lgCSJgFcrZb4ki4/YdVRgXvVBjQrmEoTPf/KficA3sM="; hash = "sha256-QFRahjDyL7BNikK2cCsFLfu4/odDbkCxplf6f7yCezE=";
}; };
vendorHash = "sha256-mnrGnQ7clzu2dkAHyCuxfX0sGU5EcHybut6GfpmOSoU="; vendorHash = "sha256-mnrGnQ7clzu2dkAHyCuxfX0sGU5EcHybut6GfpmOSoU=";

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nfs-ganesha"; pname = "nfs-ganesha";
version = "5.5"; version = "5.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nfs-ganesha"; owner = "nfs-ganesha";
repo = "nfs-ganesha"; repo = "nfs-ganesha";
rev = "V${version}"; rev = "V${version}";
sha256 = "sha256-ebnR/ukbVTwpFNzGf189NmsaDh97ThEGWew5kp50UGg="; sha256 = "sha256-fbulqSRHPdlpoLH391/axxtjJ7G/9lH9BdqoLKRuIuE=";
}; };
preConfigure = "cd src"; preConfigure = "cd src";
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
"-DSYSSTATEDIR=/var" "-DSYSSTATEDIR=/var"
"-DENABLE_VFS_POSIX_ACL=ON" "-DENABLE_VFS_POSIX_ACL=ON"
"-DUSE_ACL_MAPPING=ON" "-DUSE_ACL_MAPPING=ON"
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -42,6 +43,10 @@ stdenv.mkDerivation rec {
nfs-utils nfs-utils
]; ];
postFixup = ''
patchelf --add-rpath $out/lib $out/bin/ganesha.nfsd
'';
meta = with lib; { meta = with lib; {
description = "NFS server that runs in user space"; description = "NFS server that runs in user space";
homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki";

View File

@ -5,7 +5,7 @@ let
overrideAzureMgmtPackage = package: version: extension: hash: overrideAzureMgmtPackage = package: version: extension: hash:
# check to make sure overriding is even necessary # check to make sure overriding is even necessary
package.overrideAttrs(oldAttrs: rec { package.overridePythonAttrs(oldAttrs: rec {
inherit version; inherit version;
src = fetchPypi { src = fetchPypi {

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "stripe-cli"; pname = "stripe-cli";
version = "1.17.0"; version = "1.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stripe"; owner = "stripe";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-F+mnFarlrlQ+bq7q6CoyDPPQ7uv5y9pBRT072JRlS/4="; hash = "sha256-5j2DHbBLHQWtkQP8qTTxD949alo5mh88Vgv5cus8C/w=";
}; };
vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew=";
@ -29,7 +29,7 @@ buildGoModule rec {
rm pkg/cmd/resources_test.go rm pkg/cmd/resources_test.go
rm pkg/cmd/root_test.go rm pkg/cmd/root_test.go
# TODO: no clue why it's broken (1.17.0), remove for now. # TODO: no clue why it's broken (1.17.1), remove for now.
rm pkg/login/client_login_test.go rm pkg/login/client_login_test.go
rm pkg/git/editor_test.go rm pkg/git/editor_test.go
rm pkg/rpcservice/sample_create_test.go rm pkg/rpcservice/sample_create_test.go

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ncdu"; pname = "ncdu";
version = "1.17"; version = "1.18.1";
src = fetchurl { src = fetchurl {
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; sha256 = "sha256-fA+h6ynYWq7UuhdBZL27jwEbXDkNAXxX1mj8cjEzJAU=";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
mainProgram = "ncdu";
}; };
} }

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ripdrag"; pname = "ripdrag";
version = "0.4.2"; version = "0.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nik012003"; owner = "nik012003";
repo = "ripdrag"; repo = "ripdrag";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YTr4vxPsZAQmzE1aE7PAgUEqEyr6pywAQO4VCZ4SZoM="; hash = "sha256-SvGJb/XosR8T/bg7nhjXR15Ba1MLaerJvoetYDtgHiM=";
}; };
cargoHash = "sha256-sUT05qY1eI0kw/kDvKcD93Zg2ZcKlHu+DSQIhFChf0I="; cargoHash = "sha256-O/Xp+dZ+Pv1/yNS/KYbF2wQguq/udtJlRPeP4v3U0Vs=";
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];

View File

@ -24,13 +24,13 @@
, networkmanager , networkmanager
}: stdenv.mkDerivation rec { }: stdenv.mkDerivation rec {
pname = "tlp"; pname = "tlp";
version = "1.5.0"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linrunner"; owner = "linrunner";
repo = "TLP"; repo = "TLP";
rev = version; rev = version;
sha256 = "sha256-hHel3BVMzTYfE59kxxADnm8tqtUFntqS3RzmJSZlWjM="; hash = "sha256-XAyko2MxFyo5RyioaexhoFAR3E+I3t/8vD2K3WYNmsI=";
}; };
# XXX: See patch files for relevant explanations. # XXX: See patch files for relevant explanations.
@ -127,6 +127,7 @@
description = "Advanced Power Management for Linux"; description = "Advanced Power Management for Linux";
homepage = homepage =
"https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"; "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html";
changelog = "https://github.com/linrunner/TLP/releases/tag/${version}";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ abbradar lovesegfault ]; maintainers = with maintainers; [ abbradar lovesegfault ];
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View File

@ -15,14 +15,14 @@ The reason DESTDIR is used at all, as opposed to the more appropriate
PREFIX, is covered in the nix formula, and is (also) due to the Makefile PREFIX, is covered in the nix formula, and is (also) due to the Makefile
being a bit "different." being a bit "different."
--- ---
Makefile | 18 +++++++++--------- Makefile | 20 ++++++++++----------
1 file changed, 9 insertions(+), 9 deletions(-) 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index e9bbab4..ab05720 100644 index 8042517..1c436ad 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) @@ -57,20 +57,20 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT)
SED = sed \ SED = sed \
-e "s|@TLPVER@|$(TLPVER)|g" \ -e "s|@TLPVER@|$(TLPVER)|g" \
@ -40,9 +40,11 @@ index e9bbab4..ab05720 100644
-e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \
- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ - -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \
- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \ - -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \
- -e "s|@TLP_CONFDPR@|$(TLP_CONFDPR)|g" \
- -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ - -e "s|@TLP_CONF@|$(TLP_CONF)|g" \
+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ + -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \
+ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \ + -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \
+ -e "s|@TLP_CONFDPR@|$(_CONFDPR)|g" \
+ -e "s|@TLP_CONF@|$(_CONF)|g" \ + -e "s|@TLP_CONF@|$(_CONF)|g" \
-e "s|@TLP_RUN@|$(TLP_RUN)|g" \ -e "s|@TLP_RUN@|$(TLP_RUN)|g" \
-e "s|@TLP_VAR@|$(TLP_VAR)|g" \ -e "s|@TLP_VAR@|$(TLP_VAR)|g" \
@ -52,5 +54,5 @@ index e9bbab4..ab05720 100644
INFILES = \ INFILES = \
tlp \ tlp \
-- --
2.33.0 2.41.0

View File

@ -13,17 +13,15 @@ systemd itself to not use the hook scripts. As per the manual:
> they should rather use the Inhibitor interface[1]. > they should rather use the Inhibitor interface[1].
--- ---
Makefile | 6 +++--- Makefile | 6 +++---
tlp-sleep | 11 -----------
tlp-sleep.service.in | 19 +++++++++++++++++++ tlp-sleep.service.in | 19 +++++++++++++++++++
3 files changed, 22 insertions(+), 14 deletions(-) 2 files changed, 22 insertions(+), 3 deletions(-)
delete mode 100644 tlp-sleep
create mode 100644 tlp-sleep.service.in create mode 100644 tlp-sleep.service.in
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index ab05720..075b42f 100644 index 1c436ad..fd5211b 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -76,6 +76,7 @@ INFILES = \ @@ -84,6 +84,7 @@ INFILES = \
tlp.rules \ tlp.rules \
tlp-readconfs \ tlp-readconfs \
tlp-run-on \ tlp-run-on \
@ -31,15 +29,15 @@ index ab05720..075b42f 100644
tlp.service \ tlp.service \
tlp-stat \ tlp-stat \
tlp.upstart \ tlp.upstart \
@@ -106,7 +107,6 @@ SHFILES = \ @@ -115,7 +116,6 @@ SHFILES = \
tlp-rdw-udev.in \ tlp-rdw-udev.in \
tlp-rf.in \ tlp-rf.in \
tlp-run-on.in \ tlp-run-on.in \
- tlp-sleep \ - tlp-sleep \
tlp-sleep.elogind \ tlp-sleep.elogind \
tlp-stat.in \ tlp-stat.in \
tlp-usb-udev.in tlp-usb-udev.in \
@@ -159,7 +159,7 @@ ifneq ($(TLP_NO_INIT),1) @@ -172,7 +172,7 @@ ifneq ($(TLP_NO_INIT),1)
endif endif
ifneq ($(TLP_WITH_SYSTEMD),0) ifneq ($(TLP_WITH_SYSTEMD),0)
install -D -m 644 tlp.service $(_SYSD)/tlp.service install -D -m 644 tlp.service $(_SYSD)/tlp.service
@ -48,7 +46,7 @@ index ab05720..075b42f 100644
endif endif
ifneq ($(TLP_WITH_ELOGIND),0) ifneq ($(TLP_WITH_ELOGIND),0)
install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep
@@ -216,7 +216,7 @@ uninstall-tlp: @@ -240,7 +240,7 @@ uninstall-tlp:
rm $(_ULIB)/rules.d/85-tlp.rules rm $(_ULIB)/rules.d/85-tlp.rules
rm -f $(_SYSV)/tlp rm -f $(_SYSV)/tlp
rm -f $(_SYSD)/tlp.service rm -f $(_SYSD)/tlp.service
@ -83,5 +81,5 @@ index 0000000..79c202c
+[Install] +[Install]
+WantedBy=sleep.target +WantedBy=sleep.target
-- --
2.33.0 2.41.0

File diff suppressed because it is too large Load Diff

View File

@ -5,23 +5,18 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wasm-tools"; pname = "wasm-tools";
version = "1.0.39"; version = "1.0.40";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bytecodealliance"; owner = "bytecodealliance";
repo = pname; repo = pname;
rev = "${pname}-${version}"; rev = "${pname}-${version}";
hash = "sha256-NohA/2yzsEtMECvnntPyWvhEdVL63elmw0B+4Med6OE="; hash = "sha256-ZDQPIEDroi+YgEtQ9IsVvFSErfeyDf4KFuybEbGu91E=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoLock.lockFile = ./Cargo.lock; cargoHash = "sha256-Nynn7pxQyqfMAMGmp3eZFg7y5nj7UPyK6FLbVbN07AA=";
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoBuildFlags = [ "--package" "wasm-tools" ];
cargoTestFlags = [ "--all" ]; cargoTestFlags = [ "--all" ];
meta = with lib; { meta = with lib; {

View File

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "xcp"; pname = "xcp";
version = "0.10.0"; version = "0.10.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tarka"; owner = "tarka";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-DrB7eVo7nFsp2jGVygbBvj7zOztJ8jDkLODRFfxXhjY="; sha256 = "sha256-XFLkz6beTSto+iFjqKCLyXssXL+OccM3MNI4ldgbsqI=";
}; };
# no such file or directory errors # no such file or directory errors
doCheck = false; doCheck = false;
cargoHash = "sha256-O16aY+s27LBMcbefz4ug5+EuGAAiNsD7D0nv5KPg+Us="; cargoHash = "sha256-Bf9OjViNuE6keCmDQDlqSVterKdcgWaH031CyzviApA=";
meta = with lib; { meta = with lib; {
description = "An extended cp(1)"; description = "An extended cp(1)";

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "wormhole-william"; pname = "wormhole-william";
version = "1.0.6"; version = "1.0.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psanford"; owner = "psanford";
repo = "wormhole-william"; repo = "wormhole-william";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-L/0zgQkwADElpIzOJAROa3CN/YNl76Af2pAhX8y2Wxs="; sha256 = "sha256-KLj9ZeLcIOWA4VeuxfoOr99kUCDb7OARX/h9DSG1WHw=";
}; };
vendorSha256 = "sha256-J6iht3cagcwFekydShgaYJtkNLfEvSDqonkC7+frldM="; vendorHash = "sha256-oJz7HgtjuP4ooXdpofIKaDndGg4WqVZgbT8Yb1AyaMs=";
preCheck = '' preCheck = ''
# wormhole_test.go:692: failed to establish connection # wormhole_test.go:692: failed to establish connection

View File

@ -84,9 +84,12 @@ checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.78" version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
@ -234,7 +237,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]] [[package]]
name = "difftastic" name = "difftastic"
version = "0.50.0" version = "0.51.1"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"bumpalo", "bumpalo",
@ -245,7 +248,7 @@ dependencies = [
"glob", "glob",
"hashbrown 0.12.3", "hashbrown 0.12.3",
"humansize", "humansize",
"itertools", "itertools 0.11.0",
"lazy_static", "lazy_static",
"libc", "libc",
"libmimalloc-sys", "libmimalloc-sys",
@ -259,6 +262,8 @@ dependencies = [
"rayon", "rayon",
"regex", "regex",
"rustc-hash", "rustc-hash",
"serde",
"serde_json",
"strsim", "strsim",
"strum", "strum",
"tree-sitter", "tree-sitter",
@ -400,6 +405,21 @@ dependencies = [
"either", "either",
] ]
[[package]]
name = "itertools"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.4.0" version = "1.4.0"
@ -591,7 +611,7 @@ checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
dependencies = [ dependencies = [
"difflib", "difflib",
"float-cmp", "float-cmp",
"itertools", "itertools 0.10.3",
"normalize-line-endings", "normalize-line-endings",
"predicates-core", "predicates-core",
"regex", "regex",
@ -731,6 +751,12 @@ version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
[[package]]
name = "ryu"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]] [[package]]
name = "same-file" name = "same-file"
version = "1.0.6" version = "1.0.6"
@ -746,6 +772,37 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.176"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.176"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
]
[[package]]
name = "serde_json"
version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
"serde",
]
[[package]] [[package]]
name = "signal-hook" name = "signal-hook"
version = "0.3.14" version = "0.3.14"
@ -891,9 +948,9 @@ dependencies = [
[[package]] [[package]]
name = "typed-arena" name = "typed-arena"
version = "2.0.1" version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

View File

@ -16,13 +16,13 @@ in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "difftastic"; pname = "difftastic";
version = "0.50.0"; version = "0.51.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wilfred"; owner = "wilfred";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-CC06Bryn5VNEsW4Wwbo+ubifizCWgpWUE1FsAozZcdg="; hash = "sha256-u03UL5QB0mdMTgRtxVe4pgLlCeLx1cG7czo7uBKQI84=";
}; };
cargoLock = { cargoLock = {