Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-08-10 00:02:34 +00:00 committed by GitHub
commit 82b736180c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 2132 additions and 2074 deletions

View File

@ -15,7 +15,8 @@ in
# https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
extraModprobeConfig =
mkIf
config.hardware.bluetooth.enable
(config.hardware.bluetooth.enable &&
(lib.versionOlder config.boot.kernelPackages.kernel.version "5.12"))
"options bluetooth disable_ertm=1";
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];

View File

@ -18,7 +18,8 @@ use Config::IniFiles;
use File::Path qw(make_path);
use File::Basename;
use File::Slurp qw(read_file write_file edit_file);
use Net::DBus;
use JSON::PP;
use IPC::Cmd;
use Sys::Syslog qw(:standard :macros);
use Cwd qw(abs_path);
@ -124,12 +125,29 @@ EOF
# virtual console 1 and we restart the "tty1" unit.
$SIG{PIPE} = "IGNORE";
# Replacement for Net::DBus that calls busctl of the current systemd, parses
# it's json output and returns the response using only core modules to reduce
# dependencies on perlPackages in baseSystem
sub busctl_call_systemd1_mgr {
my (@args) = @_;
my $cmd = [
"$cur_systemd/busctl", "--json=short", "call", "org.freedesktop.systemd1",
"/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
@args
];
my ($ok, $err, undef, $stdout) = IPC::Cmd::run(command => $cmd);
die $err unless $ok;
my $res = decode_json(join "", @$stdout);
return $res;
}
# Asks the currently running systemd instance via dbus which units are active.
# Returns a hash where the key is the name of each unit and the value a hash
# of load, state, substate.
sub get_active_units {
my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1");
my $units = $mgr->ListUnitsByPatterns([], []);
my $units = busctl_call_systemd1_mgr("ListUnitsByPatterns", "asas", 0, 0)->{data}->[0];
my $res = {};
for my $item (@{$units}) {
my ($id, $description, $load_state, $active_state, $sub_state,
@ -149,9 +167,7 @@ sub get_active_units {
# Takes the name of the unit as an argument and returns a bool whether the unit is active or not.
sub unit_is_active {
my ($unit_name) = @_;
my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1");
my $units = $mgr->ListUnitsByNames([$unit_name]);
my $units = busctl_call_systemd1_mgr("ListUnitsByNames", "as", 1, $unit_name)->{data}->[0];
if (scalar(@{$units}) == 0) {
return 0;
}

View File

@ -124,7 +124,7 @@ let
configurationName = config.boot.loader.grub.configurationName;
# Needed by switch-to-configuration.
perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp NetDBus ]);
perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]);
};
# Handle assertions and warnings

View File

@ -714,6 +714,8 @@ in
RemainAfterExit = true;
};
path = lib.optionals (cfgExpandOnBoot == "all") [ cfgZfs.package ];
script = ''
for pool in ${poolListProvider}; do
systemctl start --no-block "zpool-expand@$pool"

View File

@ -12,13 +12,13 @@
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
version = "5.2.7.7";
version = "5.2.8.3";
src = fetchFromGitHub {
owner = "justarchinet";
repo = pname;
rev = version;
sha256 = "sha256-2yx6YjMsJixtaiWse65p5VeZoiSumdIjaPIlfq9Mdmw=";
sha256 = "sha256-WoEbcZbTUH34xkJ+KtAbJXFqWSpFXlXtsQgXOVknxTg=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;

View File

@ -1,6 +1,6 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; })
(fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
(fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
@ -68,7 +68,7 @@
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; })
@ -90,7 +90,6 @@
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
@ -110,9 +109,9 @@
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
(fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; })
(fetchNuGet { pname = "NLog"; version = "5.0.1"; sha256 = "1ln6qxm2kgq8vr4kja41y9b6mhcf2812fi7vbkmbc5q1bivawf1b"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.1"; sha256 = "1z7cp2zdnaiijm6m0449h5q4mpij3985nbpayscwbifsnv8xl9ci"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.0"; sha256 = "18jaxjbyaw5q166px5n5hanlwh0swlpw0fbcwh2qhvla7ik11gyk"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
@ -165,14 +164,15 @@
(fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; })
(fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.3.1"; sha256 = "1jyrqdj8bvxf1a8pcnkkj7v727c0sh1yzgnm6si7xzrhkz4zzc0z"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.3.1"; sha256 = "16mi3f130bn7arybfawc8wrwjb5zq31zyrsm7wjazj70gdpra9pb"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.3.1"; sha256 = "1siabkmip1ccnpbaf1jn6dga996kqbf9y0am2qwa9abrpn1l30p7"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.3.1"; sha256 = "1lgy5wfrdc6ihamz50qbv5sjkx4g90m6lza9al5cf36hrs6cybnw"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.3.1"; sha256 = "1ikrgxxalkf0lj591444rc2x8y0kma8ch1vpnlslvaxgq58g9jpz"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.3.1"; sha256 = "13bhyldm2gfckzvmfyx577p1fs7afsxpipjnczfapqj4fawcd72v"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.4.0"; sha256 = "0yyh74b8vlngg2mg728ds86467y9vkxys29yszl129g2n8fk5q0m"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
@ -242,7 +242,7 @@
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
@ -269,7 +269,7 @@
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })

View File

@ -1,6 +1,6 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; })
(fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
(fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
@ -68,7 +68,7 @@
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; })
@ -90,7 +90,6 @@
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
@ -110,9 +109,9 @@
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
(fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; })
(fetchNuGet { pname = "NLog"; version = "5.0.1"; sha256 = "1ln6qxm2kgq8vr4kja41y9b6mhcf2812fi7vbkmbc5q1bivawf1b"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.1"; sha256 = "1z7cp2zdnaiijm6m0449h5q4mpij3985nbpayscwbifsnv8xl9ci"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.0"; sha256 = "18jaxjbyaw5q166px5n5hanlwh0swlpw0fbcwh2qhvla7ik11gyk"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
@ -165,14 +164,15 @@
(fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; })
(fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.3.1"; sha256 = "1jyrqdj8bvxf1a8pcnkkj7v727c0sh1yzgnm6si7xzrhkz4zzc0z"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.3.1"; sha256 = "16mi3f130bn7arybfawc8wrwjb5zq31zyrsm7wjazj70gdpra9pb"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.3.1"; sha256 = "1siabkmip1ccnpbaf1jn6dga996kqbf9y0am2qwa9abrpn1l30p7"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.3.1"; sha256 = "1lgy5wfrdc6ihamz50qbv5sjkx4g90m6lza9al5cf36hrs6cybnw"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.3.1"; sha256 = "1ikrgxxalkf0lj591444rc2x8y0kma8ch1vpnlslvaxgq58g9jpz"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.3.1"; sha256 = "13bhyldm2gfckzvmfyx577p1fs7afsxpipjnczfapqj4fawcd72v"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.4.0"; sha256 = "0yyh74b8vlngg2mg728ds86467y9vkxys29yszl129g2n8fk5q0m"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
@ -242,7 +242,7 @@
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
@ -269,7 +269,7 @@
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })

View File

@ -11,8 +11,8 @@ let
repo = "ASF-ui";
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = "99278781c3716064dc25e3608a344900ebb05165";
sha256 = "0nly16g39cv4lhnm40w5ci6bdwypk0gp8n70l914907hy0nvz4vg";
rev = "60a692f2e0d6b7c2bcd2cf363042d4647f246b4b";
sha256 = "1g49zwghdfgzd5canrrw1c2r4780xyvcaz72p14w036h93fw01z2";
};
in

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
#!/usr/bin/env nix-shell
#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl
#! nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix gnused jq curl
set -eoux pipefail
pushd ../../../..
pushd ../../../../..
version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r)
popd
pushd "$(dirname "$0")"

View File

@ -3,13 +3,13 @@
buildGoModule rec {
pname = "cheat";
version = "4.2.6";
version = "4.3.1";
src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
rev = version;
sha256 = "sha256-Y+lZBJDCSLETMzLwDIht5+vfniFWPL4PehK+vKN65Es=";
sha256 = "sha256-Umbe3XoCQV+q37ROeIWQUZtTe1Nu59Z5Hxt2nc7/l64=";
};
subPackages = [ "cmd/cheat" ];

View File

@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "103.0.1";
version = "103.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "cb487e1d5d602e6b07093b5e722c4e70b9bf39f42c13c25642f263f90f9d3940d02e6fdbab9e8f41b66a50f81d70300acf81c222f08a26eed3ae55777fdc6303";
sha512 = "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a";
};
meta = {

View File

@ -5,8 +5,8 @@
makeWrapper,
offpunk,
python3,
ripgrep,
stdenv,
testVersion,
timg,
xdg-utils,
xsel,
@ -24,7 +24,6 @@ let
];
otherDependencies = [
less
ripgrep
timg
xdg-utils
xsel
@ -32,14 +31,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "offpunk";
version = "1.4";
version = "1.5";
src = fetchFromGitea {
domain = "notabug.org";
owner = "ploum";
repo = "offpunk";
rev = "v${finalAttrs.version}";
sha256 = "04dzkzsan1cnrslsvfgn1whpwald8xy34wqzvq81hd2mvw9a2n69";
sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy";
};
buildInputs = [ makeWrapper ] ++ otherDependencies ++ pythonDependencies;
@ -56,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru.tests.version = testVersion { package = offpunk; };
meta = with lib; {
description = "An Offline-First browser for the smolnet ";
homepage = "https://notabug.org/ploum/offpunk";

View File

@ -2,22 +2,25 @@
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "arkade";
version = "0.8.29";
version = "0.8.30";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
sha256 = "sha256-VCscevLGRpBgqxhRNcvIkCdroE0MawG1fROVOLjZLW0=";
sha256 = "sha256-KTZ8UJ0aQmjreio7ancJnZ0KGANAQIPYNSQGXHHSqX4=";
};
CGO_ENABLED = 0;
vendorSha256 = "sha256-CoIlqDMmhZY+B5SEabmnbP2QUu1jkFluCzLp3Y8Z7n0=";
nativeBuildInputs = [ installShellFiles ];
vendorSha256 = "sha256-6EnhO4zYYdsTKvNQApZxXo8x6oFKsmuMvOI3zPHAQLs=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [
@ -38,6 +41,13 @@ buildGoModule rec {
"-X github.com/alexellis/arkade/cmd.Version=${version}"
];
postInstall = ''
installShellCompletion --cmd arkade \
--bash <($out/bin/arkade completion bash) \
--zsh <($out/bin/arkade completion zsh) \
--fish <($out/bin/arkade completion fish)
'';
meta = with lib; {
homepage = "https://github.com/alexellis/arkade";
description = "Open Source Kubernetes Marketplace";

View File

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.3)
activesupport (7.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -13,40 +13,21 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ejson (1.3.1)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
faraday (2.4.0)
faraday-net_http (~> 2.0)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday-net_http (2.1.0)
ffi (1.15.5)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
googleauth (0.17.1)
faraday (>= 0.17.3, < 2.0)
googleauth (1.2.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.15)
signet (>= 0.16, < 2.a)
http (4.4.1)
addressable (~> 2.3)
http-cookie (~> 1.0)
@ -58,17 +39,17 @@ GEM
http-form_data (2.3.0)
http-parser (1.2.3)
ffi-compiler (>= 1.0, < 2.0)
i18n (1.11.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jsonpath (1.1.2)
multi_json
jwt (2.4.1)
krane (2.4.7)
krane (2.4.9)
activesupport (>= 5.0)
colorize (~> 0.8)
concurrent-ruby (~> 1.1)
ejson (~> 1.0)
googleauth (~> 0.8)
googleauth (~> 1.2)
jsonpath (~> 1.0)
kubeclient (~> 4.9)
oj (~> 3.0)
@ -85,9 +66,8 @@ GEM
mime-types-data (3.2022.0105)
minitest (5.16.2)
multi_json (1.15.0)
multipart-post (2.2.3)
netrc (0.11.0)
oj (3.13.16)
oj (3.13.19)
os (1.1.4)
public_suffix (4.0.7)
rake (13.0.6)
@ -103,9 +83,9 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
statsd-instrument (3.2.1)
statsd-instrument (3.3.0)
thor (1.2.1)
tzinfo (2.0.4)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext

View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj";
sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7";
type = "gem";
};
version = "7.0.3";
version = "7.0.3.1";
};
addressable = {
dependencies = ["public_suffix"];
@ -63,116 +63,25 @@
version = "1.3.1";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
dependencies = ["faraday-net_http" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
sha256 = "0i45f90mg367izgpxf6rrq9zbwwqba1pymwyja6q128vrj1pjajj";
type = "gem";
};
version = "1.10.0";
};
faraday-em_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
type = "gem";
};
version = "1.0.0";
};
faraday-em_synchrony = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
type = "gem";
};
version = "1.0.0";
};
faraday-excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
type = "gem";
};
version = "1.1.0";
};
faraday-httpclient = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
type = "gem";
};
version = "1.0.1";
};
faraday-multipart = {
dependencies = ["multipart-post"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
type = "gem";
};
version = "1.0.4";
version = "2.4.0";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
sha256 = "1rfiwhggrqgwp00c82sk8v2h93l81nxgl0mf07pijxz1zjmbgswj";
type = "gem";
};
version = "1.0.1";
};
faraday-net_http_persistent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
type = "gem";
};
version = "1.2.0";
};
faraday-patron = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
type = "gem";
};
version = "1.0.0";
};
faraday-rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
type = "gem";
};
version = "1.0.0";
};
faraday-retry = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
type = "gem";
};
version = "1.0.3";
version = "2.1.0";
};
ffi = {
groups = ["default"];
@ -201,10 +110,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08l9qb2an7a60r3xjlkrfna8b8sfnj5c2hlfdygbnpvb1p7cpafl";
sha256 = "030bcdnffwndk8h270cmbndixb5h3ss860yifv6bkfys95s5fjpp";
type = "gem";
};
version = "0.17.1";
version = "1.2.0";
};
http = {
dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"];
@ -265,10 +174,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g0g9qaarwn9ga8889r7lnaybygvd2a2dp4ilc73g4rsxxcrgy0x";
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
type = "gem";
};
version = "1.11.0";
version = "1.12.0";
};
jsonpath = {
dependencies = ["multi_json"];
@ -297,10 +206,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hmsz359zkpw1spyxx22wijzjls22qsak6rbrlv1ybk3hhk13vjg";
sha256 = "03sfcn5zfbagkyn30zih73i7pycdfzk0c5wr99d6qxl90c9cddc2";
type = "gem";
};
version = "2.4.7";
version = "2.4.9";
};
kubeclient = {
dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"];
@ -364,16 +273,6 @@
};
version = "1.15.0";
};
multipart-post = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6";
type = "gem";
};
version = "2.2.3";
};
netrc = {
groups = ["default"];
platforms = [];
@ -389,10 +288,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i8yrwnf5mzixl8a4h3cfx93gkzcs7q6grpyv0zng1vga9cmk28n";
sha256 = "1b10apyzm1qyph42438z9nx2ln5v9sg0686ws9gdrv5wh482fnmf";
type = "gem";
};
version = "3.13.16";
version = "3.13.19";
};
os = {
groups = ["default"];
@ -471,10 +370,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0653pjqln9r52nfkcjna0wf4q9ws114pz29wav2nlf18v8jazqbf";
sha256 = "1555jgxr0az43l6nc8ngz5vmhqgjaznz4mkg5w5x0q6sa78i2pf3";
type = "gem";
};
version = "3.2.1";
version = "3.3.0";
};
thor = {
groups = ["default"];
@ -492,10 +391,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
type = "gem";
};
version = "2.0.4";
version = "2.0.5";
};
unf = {
dependencies = ["unf_ext"];

View File

@ -0,0 +1,91 @@
{ stdenv
, fetchFromGitHub
, meson
, pkg-config
, ninja
, xorg
, libdrm
, vulkan-loader
, wayland
, wayland-protocols
, libxkbcommon
, libcap
, SDL2
, pipewire
, udev
, pixman
, libinput
, libseat
, xwayland
, glslang
, stb
, wlroots
, libliftoff
, lib
, makeBinaryWrapper
}:
let
pname = "gamescope";
version = "3.11.33-jupiter-3.3-2";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "Plagman";
repo = "gamescope";
rev = "refs/tags/${version}";
hash = "sha256-6/gTsQGZDQPCdmXe5EI9QcT/MkdTf6odsI2/+g/W7Qc=";
};
patches = [ ./use-pkgconfig.patch ];
nativeBuildInputs = [
meson
pkg-config
ninja
makeBinaryWrapper
];
buildInputs = [
xorg.libXdamage
xorg.libXcomposite
xorg.libXrender
xorg.libXext
xorg.libXxf86vm
xorg.libXtst
xorg.libXres
xorg.libXi
libdrm
libliftoff
vulkan-loader
glslang
SDL2
wayland
wayland-protocols
wlroots
xwayland
libseat
libinput
libxkbcommon
udev
pixman
pipewire
libcap
stb
];
# --debug-layers flag expects these in the path
postInstall = ''
wrapProgram "$out/bin/gamescope" \
--prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]}
'';
meta = with lib; {
description = "SteamOS session compositing window manager";
homepage = "https://github.com/Plagman/gamescope";
license = licenses.bsd2;
maintainers = with maintainers; [ nrdxp ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,11 @@
diff --git a/meson.build b/meson.build
index 1311784..77043ac 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,6 @@ project(
default_options: [
'cpp_std=c++14',
'warning_level=2',
- 'force_fallback_for=wlroots,libliftoff',
],
)

View File

@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DGTEST_SOURCE_DIR=${gtest.dev}/include"
] ++ lib.optionals (!doCheck) [
"-DRAPIDJSON_BUILD_TESTS=OFF"
];
checkInputs = [
@ -52,7 +54,7 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
doCheck = true;
doCheck = !stdenv.hostPlatform.isStatic;
meta = with lib; {
description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";

View File

@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
preCheck = "patchShebangs runtests";
doCheck = true;
checkTarget = "test";
checkTarget = if stdenv.hostPlatform.isStatic then "static-test" else "test";
installTargets = lib.optionals stdenv.hostPlatform.isStatic [ "static-install" ];
doInstallCheck = true;
installCheckTarget = "testinstall";
installCheckTarget = if stdenv.hostPlatform.isStatic then "static-testinstall" else "testinstall";
passthru = {
updateScript = nix-update-script {

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.12";
version = "9.2.13";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-0D/tVit7UtTLnUalO80v31djN5Tbsb1avIzN678wLmM=";
hash = "sha256-fnCeNW0Rccu6e1WrmLeHgUnlxMHh9t1q10DtzyVymP8=";
};
propagatedBuildInputs = [

View File

@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.2.12";
version = "9.2.13";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-GGTl5zGixGkikBWJ45hg3HkdrUw5Ic40VUuuEQME6ag=";
hash = "sha256-yEYqwyRJ/LN9q0f5vJIVMnVXQxRht73zDifWeevGc80=";
};
propagatedBuildInputs = [

View File

@ -3,23 +3,33 @@
, fetchPypi
, h5py
, nose
, pythonOlder
}:
buildPythonPackage rec {
version = "1.17.0";
pname = "annoy";
version = "1.17.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "9891e264041d1dcf3af42f67fbb16cb273c5404bc8c869d0915a3087f71d58dd";
hash = "sha256-vxd9vq+4H2OyrB4SRrHyairMguc7pGY4c00p2CWBIto=";
};
nativeBuildInputs = [ h5py ];
nativeBuildInputs = [
h5py
];
checkInputs = [
nose
];
pythonImportsCheck = [
"annoy"
];
meta = with lib; {
description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk";
homepage = "https://github.com/spotify/annoy";

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "anybadge";
version = "1.9.0";
version = "1.11.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "jongracecox";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9C1oPZcXjrGwvkx20E+xPGje+ATD9HwOCWWn/pg+98Q=";
sha256 = "sha256-6br4WUwE1ovAneYUeTHcUN3PH5Wm1rnLYCpXDUshk7Q=";
};
# setup.py reads its version from the TRAVIS_TAG environment variable

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.12";
version = "9.2.13";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-cBlc2YtAgjxYZE3Hoh1oW8OUf+nxzVaWtzNidSKlg3k=";
hash = "sha256-ili+jbrCKQCRD5eIWZBZqlX8wRaHiY6fC1QFEE2YOng=";
};
checkInputs = [

View File

@ -9,7 +9,7 @@
}:
buildPythonPackage rec {
version = "20.0.0";
version = "21.0.0";
pname = "azure-mgmt-network";
format = "setuptools";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-mnjPyCAJ+rlNgZ4umSYjfVVVg83EobZYY/zupyDjdoY=";
hash = "sha256-NwVC9ln7qXDJMwtCc9AyTOq7wnum3xv5DYAg8AmGR8g=";
};
propagatedBuildInputs = [

View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-servicebus";
version = "7.1.0";
version = "8.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36";
sha256 = "sha256-Ea0vFBPaeXjaxk565N4HFkK8DUzcGIHoaXL3E7b0EAI=";
};
propagatedBuildInputs = [

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "bitlist";
version = "0.8.0";
format = "setuptools";
version = "1.0.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-43Oh1ERGsW12HOqpbIa7rzLKrP9tIjckZhHwZSmBypE=";
hash = "sha256-rpXQKkV2RUuYza+gfpGEH3kFJ+hjuNGKV2i46eXQUUI=";
};
propagatedBuildInputs = [
@ -33,8 +33,8 @@ buildPythonPackage rec {
];
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov=bitlist --cov-report term-missing" ""
substituteInPlace pyproject.toml \
--replace "--doctest-modules --ignore=docs --cov=bitlist --cov-report term-missing" ""
'';
meta = with lib; {

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.12";
version = "9.2.13";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-ad6tt+cubVBNTd40xuH61/DBclX0/sfHpOV+zqC1ZLY=";
hash = "sha256-kZs2BYVfXCqi1v/cnJCDtLsEKc7xh8nG59G4N1RVSjs=";
};
propagatedBuildInputs = [

View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.12";
version = "9.2.13";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-davY/xYjbFhVP96BZtZXeoZwElmiEYT4Buy3V9GEmeQ=";
hash = "sha256-mgEDYUh3ZYvlcj8u3M3Rpfi57CA0MYuf2C3eZ4ElAzA=";
};
propagatedBuildInputs = [

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deap";
version = "1.3.1";
version = "1.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i";
sha256 = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE=";
};
postPatch = ''

View File

@ -4,21 +4,20 @@
, fetchPypi
, fountains
, parts
, nose
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "fe25519";
version = "1.2.0";
format = "setuptools";
version = "1.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE=";
hash = "sha256-/grXAiWERDeTCWgFnNC1Ok8D5I9MBlwd1501TW0yK5c=";
};
propagatedBuildInputs = [
@ -28,13 +27,12 @@ buildPythonPackage rec {
];
checkInputs = [
nose
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov=fe25519 --cov-report term-missing" ""
substituteInPlace pyproject.toml \
--replace "--doctest-modules --ignore=docs --cov=fe25519 --cov-report term-missing" ""
'';
pythonImportsCheck = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "fountains";
version = "1.3.0";
format = "setuptools";
version = "2.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w=";
hash = "sha256-9ASOgqkE1vwCKGAZXEJaHoABMXomIWTGv3jAsNssdsU=";
};
propagatedBuildInputs = [

View File

@ -4,7 +4,6 @@
, fe25519
, fetchPypi
, fountains
, nose
, parts
, pytestCheckHook
, pythonOlder
@ -12,14 +11,14 @@
buildPythonPackage rec {
pname = "ge25519";
version = "1.2.0";
format = "setuptools";
version = "1.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM=";
hash = "sha256-y9Nv59pLWk1kRjZG3EmalT34Mjx7RLZ4WkvJlRrK5LI=";
};
propagatedBuildInputs = [
@ -30,16 +29,14 @@ buildPythonPackage rec {
];
checkInputs = [
nose
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov=ge25519 --cov-report term-missing" ""
substituteInPlace pyproject.toml \
--replace "--doctest-modules --ignore=docs --cov=ge25519 --cov-report term-missing" ""
'';
pythonImportsCheck = [
"ge25519"
];

View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "karton-asciimagic";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0vj4b8man81g99g4c53zyvp1gc47c2imj5ha9r4z4bf8gs3aqsv6";
sha256 = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "karton-autoit-ripper";
version = "1.1.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "1gclrrc0n72bfj4m55kk8d69zrfvnlwm9692ni9w7d2231mvv7bw";
sha256 = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,8 @@
buildPythonPackage rec {
pname = "karton-classifier";
version = "1.2.0";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +19,7 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AG2CtNMgXYfbdlOqB1ZdjMT8H67fsSMXTgiFg6K41IQ=";
hash = "sha256-TRmAin0TAOIwR5EBMwTOJ9QaHO+mOx/eAjgqvyQZDj4=";
};
propagatedBuildInputs = [
@ -27,17 +28,25 @@ buildPythonPackage rec {
python-magic
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "chardet==3.0.4" "chardet" \
--replace "python-magic==0.4.18" "python-magic"
'';
checkInputs = [
pytestCheckHook
pythonImportsCheck = [
"karton.classifier"
];
pythonImportsCheck = [ "karton.classifier" ];
disabledTests = [
# Tests expecting results from a different version of libmagic
"test_process_archive_ace"
"test_process_runnable_win32_lnk"
];
meta = with lib; {
description = "File type classifier for the Karton framework";

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "karton-config-extractor";
version = "2.0.2";
version = "2.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "sha256-r0WMtfau5zeVDSjxy2h96INQl8bm4EP0IAcgnGPhTtk=";
sha256 = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA=";
};
propagatedBuildInputs = [

View File

@ -1,23 +1,26 @@
{ lib
, boto3
, buildPythonPackage
, fetchFromGitHub
, minio
, python
, redis
}:
buildPythonPackage rec {
pname = "karton-core";
version = "4.4.1";
version = "5.0.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = "karton";
rev = "refs/tags/v${version}";
sha256 = "sha256-smgKrFexuL0bgt/1Ikm1tpSGPJNJm7Ko68iZn3AQw5E=";
hash = "sha256-0B2u2xnrGc3iQ8B9iAQ3fcovQQCPqdFsn5evgdDwg5M=";
};
propagatedBuildInputs = [ minio redis ];
propagatedBuildInputs = [
boto3
redis
];
checkPhase = ''
runHook preCheck
@ -25,10 +28,14 @@ buildPythonPackage rec {
runHook postCheck
'';
pythonImportsCheck = [
"karton.core"
];
meta = with lib; {
description = "Distributed malware processing framework";
homepage = "https://karton-core.readthedocs.io/";
maintainers = with maintainers; [ chivay ];
license = licenses.bsd3;
maintainers = with maintainers; [ chivay fab ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "karton-dashboard";
version = "1.3.0";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-thjAgK5EgevkFdKooljrrejwJorT6Lea9QSF0cZhxmw=";
sha256 = "sha256-XMyQ0mRF4y61hqlqdxC+He+697P1URfOXQUMnV0pT7o=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "karton-mwdb-reporter";
version = "1.1.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
hash = "sha256-2qG/8D6ZlUFJg+BB/QZ9ZMJpbsLei/7TRXd6bF40Fvg=";
hash = "sha256-QVxczXT74Xt0AtCSDm4nhIK4qtHQ6bqmVNb/CALZSE4=";
};
propagatedBuildInputs = [

View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "karton-yaramatcher";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0mv8v1gk6p21pw9kx6cxr76l6c5fxd3p6dk85cwfzz100h8mdvar";
sha256 = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao=";
};
propagatedBuildInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pglast";
version = "3.13";
version = "3.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-H1IVoXBanNlmjUMhBHRbnBsbeK9LuruqXJaVgSgCFPo=";
hash = "sha256-geDH0Q5xp3Xz84f3ff4AeDMaDghrO8P504wwwi4jjhA=";
};
propagatedBuildInputs = [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "python-gvm";
version = "22.6.1";
version = "22.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-MMVrq0Tbgl1rxPwsXs3BW9Gy+LFv8blxzmefje1qwSo=";
sha256 = "sha256-0dshBFcZ0DLa6SXxzWyfzmgPPxTIiKq00OKCJfk0vKY=";
};
nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.12";
version = "9.2.13";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-nBtk67Gv4GT85PGcZ/uPMJYgFqnKfZpayB9B09ijaAw=";
hash = "sha256-YW8kfCs9j4Ay0Kw75MFZDp24NZrcmQ+82sOdJdpBsPI=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "yara-python";
version = "4.2.0";
version = "4.2.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "VirusTotal";
repo = "yara-python";
rev = "v${version}";
hash = "sha256-jNxYuIddMzANZoQ0p7BbRrX6ISpaCA7T6j+iS+FOocg=";
hash = "sha256-spUQuezQMqaG1hboM0/Gs7siCM6x0b40O+sV7qGGBng=";
};
buildInputs = [

View File

@ -4,7 +4,6 @@
, poetry
, cmake-format
, pygls
, pyparsing
, cmake
, pytest-datadir
, pytestCheckHook
@ -12,29 +11,21 @@
buildPythonApplication rec {
pname = "cmake-language-server";
version = "0.1.5";
version = "0.1.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "regen100";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-4GchuxArSJKnl28ckefJgbqxyf1fOU0DUj8R50upTcQ=";
sha256 = "sha256-B7dhCQo3g2E8+fzyl1RhaYQE6TFoqoLtp9Z7sZcv5xk=";
};
patches = [
# Test timeouts occasionally cause the build to fail
./disable-test-timeouts.patch
# cmake-language-server depends on pygls 0.11, but still works with 0.12
./use-latest-pygls.patch
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"'
'';
nativeBuildInputs = [
poetry
];
@ -42,7 +33,6 @@ buildPythonApplication rec {
propagatedBuildInputs = [
cmake-format
pygls
pyparsing
];
checkInputs = [

View File

@ -1,13 +0,0 @@
diff --git a/pyproject.toml b/pyproject.toml
index 417df1d..0f59857 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ classifiers = [
[tool.poetry.dependencies]
python = "^3.6"
-pygls = "^0.11"
+pygls = "^0.12"
importlib-metadata = {version = "^4.8", python = "<3.8"}
[tool.poetry.dev-dependencies]

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.5.10";
version = "0.5.11";
src = fetchFromGitHub {
owner = "regexident";
repo = pname;
rev = version;
sha256 = "sha256-tzJBbDo3xYZ/db8Oz8MJqWtRyljxWMNJu071zYq7d7A=";
sha256 = "sha256-dxy46ls0n7j2uax+djqB9Zy/uGgV37w5K1Zc8Wzd1Vc=";
};
cargoSha256 = "sha256-LO0Y7X498WwmZ7zl+AUBteLJeo65c0VUIAvjbW4ZDqw=";
cargoSha256 = "sha256-2Q4pGnMo4FiPPGz2XXOv6+zB5DxHA8oEqztidO2Vvyw=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreFoundation

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microcode-intel";
version = "20220510";
version = "20220809";
src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
sha256 = "sha256-x+8qyC7YP7co/7qLhaAtjMtyeANaZJ/r41iFl1Mut+M=";
hash = "sha256-vcuLQHAGr5uRkGWWIwA2WXLJadVNxfcPgjmNS82Logg=";
};
nativeBuildInputs = [ iucode-tool libarchive ];

View File

@ -18,13 +18,13 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "grab-site";
version = "2.2.2";
version = "2.2.7";
src = fetchFromGitHub {
rev = version;
owner = "ArchiveTeam";
repo = "grab-site";
sha256 = "0af53g703kqpxa6bn72mb2l5l0qrjknq5wqwl4wryyscdp4xabx4";
sha256 = "sha256-tf8GyFjya3+TVc2VjlY6ztfjCJgof6tg4an18pz+Ig8=";
};
postPatch = ''

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation {
pname = "apfsprogs";
version = "unstable-2022-02-23";
version = "unstable-2022-07-21";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "apfsprogs";
rev = "5bce5c7f42843dfbbed90767640e748062e23dd2";
sha256 = "sha256-0N+aC5paP6ZoXUD7A9lLnF2onbOJU+dqZ8oKs+dCUcg=";
rev = "8c5340bcc0a261ffe6e5ed85a1742fb60ee982f3";
sha256 = "sha256-cDxXWfXl1VxdpKBcU00ULWlidzg6kQFG4AGEu5DBCaw=";
};
buildPhase = ''

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper }:
buildGoModule rec {
pname = "3mux";
@ -11,9 +11,18 @@ buildGoModule rec {
sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag=";
};
patches = [
# Fix the build for Darwin when building with Go 1.18.
(fetchpatch {
name = "darwin-go-1.18-fix.patch";
url = "https://github.com/aaronjanse/3mux/pull/127/commits/91aed826c50f75a5175b63c72a1fb6a4ad57a008.patch";
sha256 = "sha256-MOPAyWAYYWrlCCgw1rBaNmHZO9oTIpIQwLJcs0aY/m8=";
})
];
nativeBuildInputs = [ makeWrapper ];
vendorSha256 = "sha256-tbziQZIA1+b+ZtvA/865c8YQxn+r8HQy6Pqaac2kwcU=";
vendorSha256 = "sha256-qt8MYnvbZMuU1VwdSij6+x4N0r10c1R5Gcm+jDt76uc=";
# This is a package used for internally testing 3mux. It's meant for
# use by 3mux maintainers/contributors only.

View File

@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
pname = "padbuster";
version = "0.3.3";
src = fetchFromGitHub {
owner = "AonCyberLabs";
repo = pname;
rev = "50e4a3e2bf5dfff5699440b3ebc61ed1b5c49bbe";
sha256 = "VIvZ28MVnTSQru6l8flLVVqIIpxxXD8lCqzH81sPe/U=";
};
buildInputs = [
(perl.withPackages (ps: with ps; [ LWP LWPProtocolHttps CryptSSLeay ]))
];
installPhase = ''
runHook preInstall
install -Dm755 padBuster.pl $out/bin/padBuster.pl
runHook postInstall
'';
meta = with lib; {
description = "Automated script for performing Padding Oracle attacks";
homepage = "https://www.gdssecurity.com/l/t.php";
mainProgram = "padBuster.pl";
maintainers = with maintainers; [ emilytrau ];
license = licenses.asl20;
platforms = platforms.all;
};
}

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "yara";
version = "4.2.2";
version = "4.2.3";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = pname;
rev = "v${version}";
hash = "sha256-HWLyDhFQHHmXUaAKp7EZ3ZsXlbwCEoJj4Q0qAtxwN1Y=";
hash = "sha256-Ol2btm1A8JdvYrjD0hPtc17A4L9wgr4l30C8VrImVoE=";
};
nativeBuildInputs = [

View File

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-jxxrmlavHdfou9w6KRIoAG3kBDBpg1lpk7J+E8Rx/ew=";
sha256 = "sha256-7Y51S4PM+HpiPCG3ju7Aagw1XoPM3DpckGtVhH7Od8Q=";
};
depsExtraArgs = {
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
popd
'';
};
cargoSha256 = "sha256-QW7Y/27AFjuNj+MSwi+DPdjPWqglBW6mAtg9N6BhyAY=";
cargoSha256 = "sha256-36HZ/5rx5K3mVNyBtDzJnSrKRGShFd1aEt3qqPsNqfs=";
passthru.tests.version = testers.testVersion { package = difftastic; };

View File

@ -1203,6 +1203,8 @@ with pkgs;
libgamemode32 = pkgsi686Linux.gamemode.lib;
};
gamescope = callPackage ../applications/window-managers/gamescope { };
gay = callPackage ../tools/misc/gay { };
elkhound = callPackage ../development/tools/elkhound { };
@ -9503,6 +9505,8 @@ with pkgs;
padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
padbuster = callPackage ../tools/security/padbuster { };
page = callPackage ../tools/misc/page { };
PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { };