Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-03-01 12:00:58 +00:00 committed by GitHub
commit 18bc3c64e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
56 changed files with 3520 additions and 1220 deletions

View file

@ -12495,6 +12495,12 @@
github = "MichaelBrunn3r";
githubId = 19626539;
};
MichaelCDormann = {
email = "michael.c.dormann@gmail.com";
name = "Michael Dormann";
github = "MichaelCDormann";
githubId = 12633081;
};
michaelCTS = {
email = "michael.vogel@cts.co";
name = "Michael Vogel";
@ -14178,7 +14184,8 @@
githubId = 332423;
};
nu-nu-ko = {
email = "host@nuko.city";
email = "nuko@shimeji.cafe";
matrix = "@nuko:shimeji.cafe";
github = "nu-nu-ko";
githubId = 153512689;
name = "nuko";

View file

@ -7,6 +7,8 @@ from contextlib import contextmanager
from pathlib import Path
from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union
from colorama import Fore, Style
from test_driver.logger import rootlog
from test_driver.machine import Machine, NixStartScript, retry
from test_driver.polling_condition import PollingCondition
@ -226,7 +228,10 @@ class Driver:
)
rootlog.warning(
"Using create_machine with a single dictionary argument is deprecated, and will be removed in NixOS 24.11"
Fore.YELLOW
+ Style.BRIGHT
+ "WARNING: Using create_machine with a single dictionary argument is deprecated and will be removed in NixOS 24.11"
+ Style.RESET_ALL
)
# End legacy args handling

View file

@ -246,6 +246,9 @@ in {
description = lib.mdDoc ''
List of packages that provide PipeWire configuration, in the form of
`share/pipewire/*/*.conf` files.
LV2 dependencies will be picked up from config packages automatically
via `passthru.requiredLv2Packages`.
'';
};
@ -258,7 +261,8 @@ in {
be made available to PipeWire for [filter chains][wiki-filter-chain].
Config packages have their required LV2 plugins added automatically,
so they don't need to be specified here.
so they don't need to be specified here. Config packages need to set
`passthru.requiredLv2Packages` for this to work.
[wiki-filter-chain]: https://docs.pipewire.org/page_module_filter_chain.html
'';

View file

@ -30,6 +30,9 @@ in
description = lib.mdDoc ''
List of packages that provide WirePlumber configuration, in the form of
`share/wireplumber/*/*.lua` files.
LV2 dependencies will be picked up from config packages automatically
via `passthru.requiredLv2Packages`.
'';
};
@ -42,7 +45,8 @@ in
be made available to WirePlumber for [filter chains][wiki-filter-chain].
Config packages have their required LV2 plugins added automatically,
so they don't need to be specified here.
so they don't need to be specified here. Config packages need to set
`passthru.requiredLv2Packages` for this to work.
[wiki-filter-chain]: https://docs.pipewire.org/page_module_filter_chain.html
'';
@ -108,7 +112,7 @@ in
)
config.environment.etc
)) == 1;
message = "Using `environment.etc.\"wireplumber<...>\"` directly is no longer supported in 24.05. Use `services.wireplumber.configPackages` instead.";
message = "Using `environment.etc.\"wireplumber<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.wireplumber.configPackages` instead.";
}
];

View file

@ -63,6 +63,12 @@ in {
type = types.port;
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc "Opens the port used by the firewall.";
};
storagePath = mkOption {
type = types.nullOr types.path;
default = "/var/lib/docker-registry";
@ -154,5 +160,9 @@ in {
isSystemUser = true;
};
users.groups.docker-registry = {};
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
};
};
}

View file

@ -127,6 +127,7 @@ in {
spectacle
systemsettings
kcmutils
# Gear
baloo

View file

@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
services.dockerRegistry.port = 8080;
services.dockerRegistry.listenAddress = "0.0.0.0";
services.dockerRegistry.enableGarbageCollect = true;
networking.firewall.allowedTCPPorts = [ 8080 ];
services.dockerRegistry.openFirewall = true;
};
client1 = { ... }: {

View file

@ -1,25 +1,17 @@
{ lib, mkDerivation, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub
, pkg-config
, help2man
, qmake
, alsa-lib
, libjack2
, dbus
, qtbase
, qttools
, qtx11extras
, qt6
, meson
, python3
, rtaudio
, ninja
, qtquickcontrols2
, qtnetworkauth
, qtwebsockets
, qtgraphicaleffects
}:
mkDerivation rec {
version = "1.10.1";
stdenv.mkDerivation rec {
version = "2.2.2";
pname = "jacktrip";
src = fetchFromGitHub {
@ -27,7 +19,7 @@ mkDerivation rec {
repo = "jacktrip";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-bdYhyLsdL4LDkCzJiWXdi+7CTtqhSiA7HNYhg190NWs=";
sha256 = "sha256-idfetMiMqjl9Qrun4hlFhQaGWcvasgjojTts+0F3GGE=";
};
preConfigure = ''
@ -36,8 +28,8 @@ mkDerivation rec {
buildInputs = [
rtaudio
qtbase
qtx11extras
qt6.qtbase
qt6.qtwayland
libjack2
dbus
];
@ -49,12 +41,13 @@ mkDerivation rec {
ninja
help2man
meson
qmake
qttools
qtquickcontrols2
qtnetworkauth
qtwebsockets
qtgraphicaleffects
qt6.qt5compat
qt6.qtnetworkauth
qt6.qtwebsockets
qt6.qtwebengine
qt6.qtdeclarative
qt6.qtsvg
qt6.wrapQtAppsHook
pkg-config
];

View file

@ -10,16 +10,16 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2023.1.1.28"; # "Android Studio Hedgehog | 2023.1.1 Patch 2"
sha256Hash = "sha256-E50Nu0kJNTto+/VcCbbTGjRRIESp1PAs4PGprMyhKPk=";
version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1"
sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM=";
};
betaVersion = {
version = "2023.2.1.22"; # "Android Studio Iguana | 2023.2.1 RC 2"
sha256Hash = "sha256-sy4Cfg+d4DuIUCrP4/Fp6mnsn5bWSy6PQ42kw3NpH/o=";
version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1"
sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM=";
};
latestVersion = {
version = "2023.3.1.9"; # "Android Studio Jellyfish | 2023.3.1 Canary 9"
sha256Hash = "sha256-xn84sodpYcJgILwGBixuwhug9hZupqfizG98KYLSHsw=";
version = "2023.3.1.12"; # "Android Studio Jellyfish | 2023.3.1 Canary 12"
sha256Hash = "sha256-yg84WBLHfb6q+OlHuh5SJ5P4Fuc8yqO9eZ8iecOhZj4=";
};
in {
# Attributes are named by their corresponding release channels

View file

@ -131,7 +131,7 @@ stdenv.mkDerivation(finalAttrs: {
];
# Does some handrolled SIMD
env.NIX_CFLAGS_COMPILE = "-msse4.1";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1";
# Fixes vulkan detection.
# FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate
@ -174,7 +174,7 @@ stdenv.mkDerivation(finalAttrs: {
Using the early-access branch is recommended if you would like to try out experimental features, with a cost of stability.
'';
mainProgram = "yuzu";
platforms = [ "x86_64-linux" ];
platforms = [ "aarch64-linux" "x86_64-linux" ];
license = with licenses; [
gpl3Plus
# Icons

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook }:
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook, libGL }:
let
buildNumber = "1293";
vaqua = fetchurl {
@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
buildPhase = ''
runHook preBuild
echo "tarring jdk"
tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk}
cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
@ -78,9 +80,13 @@ stdenv.mkDerivation rec {
cd build
ant build
cd ..
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/
mkdir -p $out/share/applications/
cp -dp build/linux/${pname}.desktop $out/share/applications/
@ -89,10 +95,14 @@ stdenv.mkDerivation rec {
ln -s ${jdk} $out/share/${pname}/java
makeWrapper $out/share/${pname}/processing $out/bin/processing \
''${gappsWrapperArgs[@]} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd
makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \
''${gappsWrapperArgs[@]} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd
runHook postInstall
'';
meta = with lib; {

View file

@ -1,29 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.4)
activesupport (7.1.3.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.6)
colorator (1.1.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
drb (2.2.0)
ruby2_keywords
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
gemoji (4.0.1)
gemoji (4.1.0)
google-protobuf (3.25.3)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.1)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@ -44,8 +55,8 @@ GEM
jekyll-mentions (1.6.0)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
@ -60,34 +71,38 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.0)
minitest (5.16.3)
nokogiri (1.13.9)
mini_portile2 (~> 2.8.0)
mini_portile2 (2.8.5)
minitest (5.22.2)
mutex_m (0.2.0)
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.0)
racc (1.6.0)
public_suffix (5.0.4)
racc (1.7.3)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (4.0.0)
rexml (3.2.6)
rouge (4.2.0)
ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sass-embedded (1.71.1)
google-protobuf (~> 3.25)
rake (>= 13.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.3.0)
webrick (1.7.0)
unicode-display_width (2.5.0)
webrick (1.8.1)
PLATFORMS
ruby
@ -101,4 +116,4 @@ DEPENDENCIES
jemoji
BUNDLED WITH
2.3.9
2.5.6

View file

@ -1,14 +1,14 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0";
sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
type = "gem";
};
version = "7.0.4";
version = "7.1.3.2";
};
addressable = {
dependencies = ["public_suffix"];
@ -16,10 +16,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
type = "gem";
};
version = "2.8.1";
version = "2.8.6";
};
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
type = "gem";
};
version = "3.1.6";
};
colorator = {
groups = ["default"];
@ -36,10 +56,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
type = "gem";
};
version = "1.1.10";
version = "1.2.3";
};
connection_pool = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
type = "gem";
};
version = "2.4.1";
};
drb = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
type = "gem";
};
version = "2.2.0";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@ -67,10 +108,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
type = "gem";
};
version = "1.15.5";
version = "1.16.3";
};
forwardable-extended = {
groups = ["default"];
@ -87,10 +128,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h";
sha256 = "06nw5mfscjmpap7f0bc9f2hj6zd4jy3pk1lhs6llx5my1h138i3k";
type = "gem";
};
version = "4.0.1";
version = "4.1.0";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r";
type = "gem";
};
version = "3.25.3";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@ -119,10 +170,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
type = "gem";
};
version = "1.12.0";
version = "1.14.1";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
@ -130,10 +181,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy";
sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a";
type = "gem";
};
version = "4.3.1";
version = "4.3.3";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@ -158,15 +209,15 @@
version = "1.6.0";
};
jekyll-sass-converter = {
dependencies = ["sassc"];
dependencies = ["sass-embedded"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "077xkkkb592vg8kxdia9jwsaz1bc70lkpf4hdvazjqphn5hlz2bi";
sha256 = "00n9v19h0qgjijygfdkdh2gwpmdlz49nw1mqk6fnp43f317ngrz2";
type = "gem";
};
version = "2.2.0";
version = "3.0.0";
};
jekyll-seo-tag = {
dependencies = ["jekyll"];
@ -239,10 +290,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by";
sha256 = "1czxv2i1gv3k7hxnrgfjb0z8khz74l4pmfwd70c7kr25l2qypksg";
type = "gem";
};
version = "4.0.3";
version = "4.0.4";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -250,10 +301,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v";
sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv";
type = "gem";
};
version = "3.7.1";
version = "3.9.0";
};
mercenary = {
groups = ["default"];
@ -270,20 +321,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
type = "gem";
};
version = "2.8.0";
version = "2.8.5";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
type = "gem";
};
version = "5.16.3";
version = "5.22.2";
};
mutex_m = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
type = "gem";
};
version = "0.2.0";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@ -291,10 +352,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8";
type = "gem";
};
version = "1.13.9";
version = "1.16.2";
};
pathutil = {
dependencies = ["forwardable-extended"];
@ -312,20 +373,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
type = "gem";
};
version = "5.0.0";
version = "5.0.4";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
type = "gem";
};
version = "1.6.0";
version = "1.7.3";
};
rake = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
type = "gem";
};
version = "13.1.0";
};
rb-fsevent = {
groups = ["default"];
@ -353,20 +424,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
type = "gem";
};
version = "3.2.5";
version = "3.2.6";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq";
sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0";
type = "gem";
};
version = "4.0.0";
version = "4.2.0";
};
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "0.0.5";
};
safe_yaml = {
groups = ["default"];
@ -378,16 +459,16 @@
};
version = "1.0.5";
};
sassc = {
dependencies = ["ffi"];
sass-embedded = {
dependencies = ["google-protobuf" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c";
sha256 = "1ccqqkmicqs2nbawyknb17qfafwqq0k6jxibcm86vqd1jp185pxa";
type = "gem";
};
version = "2.4.0";
version = "1.71.1";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@ -406,29 +487,29 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem";
};
version = "2.0.5";
version = "2.0.6";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7";
sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
type = "gem";
};
version = "2.3.0";
version = "2.5.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
version = "1.7.0";
version = "1.8.1";
};
}

View file

@ -1,13 +1,20 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.4)
activesupport (7.1.3.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.6)
classifier-reborn (2.3.0)
fast-stemmer (~> 1.0)
matrix (~> 0.4)
@ -17,27 +24,31 @@ GEM
execjs
coffee-script-source (1.12.2)
colorator (1.1.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
drb (2.2.0)
ruby2_keywords
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
execjs (2.8.1)
faraday (2.7.1)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
execjs (2.9.1)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
faraday-net_http (3.1.0)
net-http
fast-stemmer (1.0.2)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
gemoji (4.0.1)
gemoji (4.1.0)
google-protobuf (3.25.3)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.1)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@ -70,12 +81,12 @@ GEM
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
jekyll-polyglot (1.5.1)
jekyll (>= 3.0)
jekyll-polyglot (1.7.0)
jekyll (>= 4.0, >= 3.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
@ -93,54 +104,60 @@ GEM
kramdown-syntax-coderay (1.0.1)
coderay (~> 1.1)
kramdown (~> 2.0)
liquid (4.0.3)
liquid-c (4.0.0)
liquid (4.0.4)
liquid-c (4.0.1)
liquid (>= 3.0.0)
listen (3.7.1)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
matrix (0.4.2)
mercenary (0.4.0)
mime-types (3.4.1)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_magick (4.11.0)
mini_portile2 (2.8.0)
minitest (5.16.3)
nokogiri (1.13.9)
mini_portile2 (~> 2.8.0)
mime-types-data (3.2024.0206)
mini_magick (4.12.0)
mini_portile2 (2.8.5)
minitest (5.22.2)
mutex_m (0.2.0)
net-http (0.4.1)
uri
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
psych (4.0.6)
psych (5.1.2)
stringio
public_suffix (5.0.0)
racc (1.6.0)
public_suffix (5.0.4)
racc (1.7.3)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.4.0)
rdoc (6.6.2)
psych (>= 4.0.0)
rexml (3.2.5)
rouge (4.0.0)
rexml (3.2.6)
rouge (4.2.0)
ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sass-embedded (1.71.1)
google-protobuf (~> 3.25)
rake (>= 13.0.0)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
stringio (3.0.2)
stringio (3.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tomlrb (1.3.0)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.3.0)
webrick (1.7.0)
unicode-display_width (2.5.0)
uri (0.13.0)
webrick (1.8.1)
yajl-ruby (1.4.3)
PLATFORMS
@ -169,4 +186,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4)
BUNDLED WITH
2.3.9
2.5.6

View file

@ -1,14 +1,14 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0";
sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
type = "gem";
};
version = "7.0.4";
version = "7.1.3.2";
};
addressable = {
dependencies = ["public_suffix"];
@ -16,10 +16,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
type = "gem";
};
version = "2.8.1";
version = "2.8.6";
};
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
type = "gem";
};
version = "3.1.6";
};
classifier-reborn = {
dependencies = ["fast-stemmer" "matrix"];
@ -90,10 +110,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
type = "gem";
};
version = "1.1.10";
version = "1.2.3";
};
connection_pool = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
type = "gem";
};
version = "2.4.1";
};
drb = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
type = "gem";
};
version = "2.2.0";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@ -121,31 +162,32 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd";
sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8";
type = "gem";
};
version = "2.8.1";
version = "2.9.1";
};
faraday = {
dependencies = ["faraday-net_http" "ruby2_keywords"];
dependencies = ["faraday-net_http"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590";
sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";
type = "gem";
};
version = "2.7.1";
version = "2.9.0";
};
faraday-net_http = {
dependencies = ["net-http"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8";
sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";
type = "gem";
};
version = "3.0.2";
version = "3.1.0";
};
fast-stemmer = {
groups = ["default"];
@ -174,10 +216,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
type = "gem";
};
version = "1.15.5";
version = "1.16.3";
};
forwardable-extended = {
groups = ["default"];
@ -194,10 +236,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h";
sha256 = "06nw5mfscjmpap7f0bc9f2hj6zd4jy3pk1lhs6llx5my1h138i3k";
type = "gem";
};
version = "4.0.1";
version = "4.1.0";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r";
type = "gem";
};
version = "3.25.3";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@ -226,10 +278,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
type = "gem";
};
version = "1.12.0";
version = "1.14.1";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
@ -237,10 +289,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy";
sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a";
type = "gem";
};
version = "4.3.1";
version = "4.3.3";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@ -324,10 +376,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lx24z2smi6isbdx0afjy68wla579alvljmq8z137b9f7ja2ww0y";
sha256 = "189scj27hczbxp02s5v27r4civfqq2fr981jrp0xldwvcw5qfbll";
type = "gem";
};
version = "1.5.1";
version = "1.7.0";
};
jekyll-redirect-from = {
dependencies = ["jekyll"];
@ -341,15 +393,15 @@
version = "0.16.0";
};
jekyll-sass-converter = {
dependencies = ["sassc"];
dependencies = ["sass-embedded"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "077xkkkb592vg8kxdia9jwsaz1bc70lkpf4hdvazjqphn5hlz2bi";
sha256 = "00n9v19h0qgjijygfdkdh2gwpmdlz49nw1mqk6fnp43f317ngrz2";
type = "gem";
};
version = "2.2.0";
version = "3.0.0";
};
jekyll-seo-tag = {
dependencies = ["jekyll"];
@ -445,10 +497,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by";
sha256 = "1czxv2i1gv3k7hxnrgfjb0z8khz74l4pmfwd70c7kr25l2qypksg";
type = "gem";
};
version = "4.0.3";
version = "4.0.4";
};
liquid-c = {
dependencies = ["liquid"];
@ -468,10 +520,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ibcpajsgq530xrz3dk578mfvivrlfd624j6ifz6ms4w69j8jqj6";
sha256 = "07psn4z99738x2vqgl097pgdnanz0pilfp6nla405y1l802nfq7j";
type = "gem";
};
version = "4.0.0";
version = "4.0.1";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -479,10 +531,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v";
sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv";
type = "gem";
};
version = "3.7.1";
version = "3.9.0";
};
matrix = {
groups = ["default"];
@ -522,50 +574,71 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1";
type = "gem";
};
version = "3.4.1";
version = "3.5.2";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5";
type = "gem";
};
version = "3.2022.0105";
version = "3.2024.0206";
};
mini_magick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
type = "gem";
};
version = "4.11.0";
version = "4.12.0";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
type = "gem";
};
version = "2.8.0";
version = "2.8.5";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
type = "gem";
};
version = "5.16.3";
version = "5.22.2";
};
mutex_m = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
type = "gem";
};
version = "0.2.0";
};
net-http = {
dependencies = ["uri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9";
type = "gem";
};
version = "0.4.1";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@ -573,10 +646,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8";
type = "gem";
};
version = "1.13.9";
version = "1.16.2";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@ -606,30 +679,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xmq609h7j0xjr7jwayg8kmvcpp347cp0wnyq7jgpn58vk1ja17p";
sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk";
type = "gem";
};
version = "4.0.6";
version = "5.1.2";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
type = "gem";
};
version = "5.0.0";
version = "5.0.4";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
type = "gem";
};
version = "1.6.0";
version = "1.7.3";
};
rake = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
type = "gem";
};
version = "13.1.0";
};
rb-fsevent = {
groups = ["default"];
@ -658,30 +741,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bxzcvxvrmb1ngxz0bgz1va4q9c4w8m6gc8lmdhi6gnvaaf98gsy";
sha256 = "14wnrpd1kl43ynk1wwwgv9avsw84d1lrvlfyrjy3d4h7h7ndnqzp";
type = "gem";
};
version = "6.4.0";
version = "6.6.2";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
type = "gem";
};
version = "3.2.5";
version = "3.2.6";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq";
sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0";
type = "gem";
};
version = "4.0.0";
version = "4.2.0";
};
ruby2_keywords = {
groups = ["default"];
@ -703,16 +786,16 @@
};
version = "1.0.5";
};
sassc = {
dependencies = ["ffi"];
sass-embedded = {
dependencies = ["google-protobuf" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c";
sha256 = "1ccqqkmicqs2nbawyknb17qfafwqq0k6jxibcm86vqd1jp185pxa";
type = "gem";
};
version = "2.4.0";
version = "1.71.1";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@ -730,10 +813,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jns0x5lbafyqyx7pgzfs6i4ykc7p6zg7gxa6hd82w40n6z9rdvi";
sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1";
type = "gem";
};
version = "3.0.2";
version = "3.1.0";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@ -762,30 +845,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem";
};
version = "2.0.5";
version = "2.0.6";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7";
sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
type = "gem";
};
version = "2.3.0";
version = "2.5.0";
};
uri = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96";
type = "gem";
};
version = "0.13.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
version = "1.7.0";
version = "1.8.1";
};
yajl-ruby = {
groups = ["default"];

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bundix zlib
#!nix-shell -i bash -p bundix zlib libyaml
set -o errexit
set -o nounset

View file

@ -59,7 +59,6 @@ let
license = licenses.gpl3Plus;
maintainers = with maintainers; [ bbjubjub ];
mainProgram = "onionshare-cli";
};
# TODO: package meek https://support.torproject.org/glossary/meek/
@ -69,7 +68,7 @@ in
rec {
onionshare = buildPythonApplication {
pname = "onionshare-cli";
inherit version meta;
inherit version;
src = "${src}/cli";
patches = [
# hardcode store paths of dependencies
@ -122,11 +121,15 @@ rec {
# to fake
"test_receive_mode_webhook"
];
meta = meta // {
mainProgram = "onionshare-cli";
};
};
onionshare-gui = buildPythonApplication {
pname = "onionshare";
inherit version meta;
inherit version;
src = "${src}/desktop";
patches = [
# hardcode store paths of dependencies
@ -155,12 +158,18 @@ rec {
cp $src/org.onionshare.OnionShare.appdata.xml $out/share/appdata
'';
dontWrapQtApps = true;
preFixup = ''
wrapQtApp $out/bin/onionshare
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
doCheck = false;
pythonImportsCheck = [ "onionshare" ];
meta = meta // {
mainProgram = "onionshare";
};
};
}

View file

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf";
};
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
buildInputs = [ jdk ];
buildPhase = ''

View file

@ -10,11 +10,11 @@ let
};
in stdenv.mkDerivation (finalAttrs: {
pname = "filebot";
version = "5.1.2";
version = "5.1.3";
src = fetchurl {
url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz";
hash = "sha256-+5I0t67asbCwaMCuqI/ixRHNAdcLTziuYOfepVThoPk=";
hash = "sha256-1TkCV3Cjg/5YZODceV5mQDsPYk09IU7+UHwPRwt2vAQ=";
};
unpackPhase = "tar xvf $src";

View file

@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.14.3";
version = "1.14.4";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
hash = "sha256-BsDkPwHi8nUcxw6KSrsMvVCdD6/BxVDuiBkAdv8H2xc=";
hash = "sha256-f+cG9800QKZH4+9ie97TmTbQlpLXe+z+47ptP+HgIgs=";
fetchSubmodules = true;
};

View file

@ -1,28 +1,34 @@
{ lib, pkgs, formats, runCommand, dasel }:
{ lib, pkgs, formats, runCommand }:
let
daselBin = lib.getExe dasel;
inherit (lib)
last
optionalString
types
;
in
rec {
# Creates a transformer function that writes input data to disk, transformed
# by both the `input` and `output` arguments.
#
# Type: makeDataWriter :: input -> output -> nameOrPath -> data -> (any -> string) -> string -> string -> any -> derivation
#
# input :: T -> string: function that takes the nix data and returns a string
# output :: string: script that takes the $inputFile and write the result into $out
# nameOrPath :: string: if the name contains a / the files gets written to a sub-folder of $out. The derivation name is the basename of this argument.
# data :: T: the data that will be converted.
#
# Example:
# writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; };
# myConfig = writeJSON "config.json" { hello = "world"; }
#
{
/**
Creates a transformer function that writes input data to disk, transformed
by both the `input` and `output` arguments.
# Example
```nix
writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; };
myConfig = writeJSON "config.json" { hello = "world"; }
```
# Type
```
makeDataWriter :: input -> output -> nameOrPath -> data -> (any -> string) -> string -> string -> any -> derivation
input :: T -> string: function that takes the nix data and returns a string
output :: string: script that takes the $inputFile and write the result into $out
nameOrPath :: string: if the name contains a / the files gets written to a sub-folder of $out. The derivation name is the basename of this argument.
data :: T: the data that will be converted.
```
*/
makeDataWriter = lib.warn "pkgs.writers.makeDataWriter is deprecated. Use pkgs.writeTextFile." ({ input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
let
@ -44,21 +50,36 @@ rec {
inherit (pkgs) writeText;
# Writes the content to a JSON file.
#
# Example:
# writeJSON "data.json" { hello = "world"; }
/**
Writes the content to a JSON file.
# Example
```nix
writeJSON "data.json" { hello = "world"; }
```
*/
writeJSON = (pkgs.formats.json {}).generate;
# Writes the content to a TOML file.
#
# Example:
# writeTOML "data.toml" { hello = "world"; }
/**
Writes the content to a TOML file.
# Example
```nix
writeTOML "data.toml" { hello = "world"; }
```
*/
writeTOML = (pkgs.formats.toml {}).generate;
# Writes the content to a YAML file.
#
# Example:
# writeYAML "data.yaml" { hello = "world"; }
/**
Writes the content to a YAML file.
# Example
```nix
writeYAML "data.yaml" { hello = "world"; }
```
*/
writeYAML = (pkgs.formats.yaml {}).generate;
}

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "files-cli";
version = "2.12.38";
version = "2.12.39";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-DjNnD852VOcIHrVtzf2fXm7PRpvrQIF51xqfA5BrJxI=";
hash = "sha256-E2vxgDdTXIuge160mpu7w/cs2M3fRYlUyvNtPq3AncA=";
};
vendorHash = "sha256-EUPaPihTDHRh0Y4HEPhpgl1Qa3rfhOdJHO/uRD8KzT4=";

View file

@ -0,0 +1,65 @@
{ lib
, stdenv
, fetchFromGitHub
, which
, pkg-config
, zip
, imagemagick
, qt5
, taglib
, gst_all_1
}:
stdenv.mkDerivation rec {
pname = "nulloy";
version = "0.9.8.7";
src = fetchFromGitHub {
owner = "nulloy";
repo = "nulloy";
rev = version;
hash = "sha256-s8DzL7pp3hmD9k8pVqmk7WGq3zZ1tLF9C+jxcRtJOXA=";
};
nativeBuildInputs = [
which # used by configure script
pkg-config
zip
imagemagick
qt5.qttools
qt5.wrapQtAppsHook
];
buildInputs = [
qt5.qtscript
qt5.qtsvg
taglib
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
]);
prefixKey = "--prefix ";
enableParallelBuilding = true;
# FIXME: not added by gstreamer setup hook by default
preFixup = ''
qtWrapperArgs+=(
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
)
'';
meta = with lib; {
description = "Music player with a waveform progress bar";
homepage = "https://nulloy.com";
license = licenses.gpl3Only;
mainProgram = "nulloy";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.all;
broken = stdenv.isDarwin;
};
}

1509
pkgs/by-name/ro/roon-tui/Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,32 @@
{ stdenv
, lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "roon-tui";
version = "0.3.0";
src = fetchFromGitHub {
owner = "TheAppgineer";
repo = "roon-tui";
rev = version;
hash = "sha256-rwZPUa6NyKs+jz0+JQC0kSrw0T/EL+ms2m+AzHvrI7o=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"roon-api-0.1.1" = "sha256-aFcS8esfgMxzzhWLeynTRFp1FZj2z6aHIivU/5p+uec=";
};
};
meta = {
description = "A Roon Remote for the terminal";
homepage = "https://github.com/TheAppgineer/roon-tui";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ MichaelCDormann ];
mainProgram = "roon-tui";
};
}

View file

@ -1,5 +1,4 @@
{ darwin
, fetchpatch
, fetchFromGitHub
, lib
, perl
@ -7,31 +6,21 @@
, openssl
, rustPlatform
, stdenv
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "screenly-cli";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "screenly";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-rQK1EYb1xYtcxq0Oj4eY9PCFMoaYinr42W8NkG36ps0=";
hash = "sha256-DSeI7ddsdsb+DLVPRyqpvz6WIRFBBaWjYJHlFpN8SrY=";
};
cargoPatches = [
# This patch introduces the Cargo.lock file, which was previously missing from the repository.
# This can be removed at the next release of the Screenly CLI. The patch was introduced in
# this PR: https://github.com/Screenly/cli/pull/139.
(fetchpatch {
url = "https://github.com/Screenly/cli/commit/898bd2e5e3a9653e3c3dde17e951469885734c40.patch";
hash = "sha256-Cqc1PHRhgS3zK19bSqpU2v+R3jSlOY6oaLJXpUy6+50=";
includes = [ "Cargo.lock" ];
})
];
cargoHash = "sha256-TzJ56Wuk77qrxDLL17fYEj4i/YhAS6DRmjoqrzb+5AA=";
cargoHash = "sha256-W8xFOotHxFlBZhEUDRTJGsbr+GjG3ALynaoMgTxPPmM=";
nativeBuildInputs = [
pkg-config
@ -47,9 +36,12 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.SystemConfiguration
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Tools for managing digital signs and screens at scale";
homepage = "https://github.com/Screenly/cli";
changelog = "https://github.com/Screenly/cli/releases/tag/v${version}";
license = lib.licenses.mit;
mainProgram = "screenly";
maintainers = with lib.maintainers; [ jnsgruk vpetersson ];

View file

@ -4133,7 +4133,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
[[package]]
name = "uv"
version = "0.1.12"
version = "0.1.13"
dependencies = [
"anstream",
"anyhow",
@ -4228,6 +4228,7 @@ dependencies = [
"pypi-types",
"pyproject-toml",
"regex",
"rustc-hash",
"serde",
"serde_json",
"tempfile",
@ -4374,6 +4375,7 @@ dependencies = [
"platform-host",
"platform-tags",
"pypi-types",
"rustc-hash",
"tempfile",
"tokio",
"tracing",

View file

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "uv";
version = "0.1.12";
version = "0.1.13";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = version;
hash = "sha256-tM8NX4BPGm8Xxlau+qpKSljTdSJutipsYFsZAdtmZuo=";
hash = "sha256-MPDzuk6pE+uKr9ic0Q9gIk1yByZ/FdcVZx6ZheECR8A=";
};
cargoLock = {

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "wit-bindgen";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wit-bindgen";
rev = "v${version}";
hash = "sha256-vJqJ+qDoU6W5S4mhBG6YQoVvvXqcqm7WXwypCS36z6c=";
hash = "sha256-8z6WgKahb01A9RAJsmavgGAeXkh6Hcr6qnzLhcfuHbw=";
};
cargoHash = "sha256-uDqXG/OyFyJbwrZzQVRDLxreKdyOEvenE8MNnLFs9CA=";
cargoHash = "sha256-v14p4b2nUFtXs15b3zmYKAG1am+KDRfw2MfrjNQFjvw=";
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
# However, GitHub Actions ensures a proper build.

View file

@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
description = "Lisp implementation aiming to be small, fast and easy to embed";
homepage = "https://common-lisp.net/project/ecl/";
license = licenses.mit;
mainProgram = "ecl";
maintainers = lib.teams.lisp.members;
platforms = platforms.unix;
changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${version}/CHANGELOG";

View file

@ -231,6 +231,7 @@ stdenv.mkDerivation (self: rec {
description = "Common Lisp compiler";
homepage = "https://sbcl.org";
license = licenses.publicDomain; # and FreeBSD
mainProgram = "sbcl";
maintainers = lib.teams.lisp.members;
platforms = attrNames bootstrapBinaries ++ [
# These arent bootstrapped using the binary distribution but compiled

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "guile-git";
version = "0.5.2";
version = "0.6.0";
src = fetchFromGitLab {
owner = "guile-git";
repo = pname;
rev = "v${version}";
sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU=";
sha256 = "sha256-+GVGM9XOy8+nFChyJazRWsNBjS+HYUBnbUErCVkxZyg=";
};
strictDeps = true;

View file

@ -126,6 +126,7 @@ stdenv.mkDerivation {
meta = {
description = "ANSI Common Lisp Implementation";
homepage = "http://clisp.org";
mainProgram = "clisp";
maintainers = lib.teams.lisp.members;
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux ++ darwin;

View file

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "18.0.1";
version = "18.0.2";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-wCaDwaD/Xvm++PCrDmXo2Nqn9z07et8AhSI1e1527vc=";
hash = "sha256-R/emS2h9YM9LwgQARphFPaX1S62T8Rwqs0uLq1y929o=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-4fKJD3YmwFrHk38PUrpn4BDFkByylqRgPmuVHcVxdSI=";
cargoHash = "sha256-r7fmKriChDvd09eynpxVOywBMkArMR4epsmtY6U6JI4=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];

View file

@ -24,13 +24,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ctranslate2";
version = "3.24.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "OpenNMT";
repo = "CTranslate2";
rev = "v${version}";
hash = "sha256-RK5GQymtaYOM6HK2eRK5Rbz6NZva3Jt7lTPTUbSQXxI=";
hash = "sha256-pySnkDnV41rqr4OcNonPtSgv4AJYcF5vtkBg6Ad/IvU=";
fetchSubmodules = true;
};

File diff suppressed because it is too large Load diff

View file

@ -5,17 +5,17 @@
php.buildComposerProject (finalAttrs: {
pname = "php-codesniffer";
version = "3.7.2";
version = "3.9.0";
src = fetchFromGitHub {
owner = "squizlabs";
owner = "PHPCSStandards";
repo = "PHP_CodeSniffer";
rev = "${finalAttrs.version}";
hash = "sha256-EJF9e8gyUy5SZ+lmyWFPAabqnP7Fy5t80gfXWWxLpk8=";
hash = "sha256-HyAb0vfruJWch09GVWtKI+NOTpsUkkLRusFSwZlNHjA=";
};
composerLock = ./composer.lock;
vendorHash = "sha256-svkQEKKFa0yFTiOihnAzVdi3oolq3r6JmlugyBZJATA=";
vendorHash = "sha256-nM0sKdD+fc3saPCvU+0KI7HM+LdSi0vJIoutwuZnx/Y=";
meta = {
changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}";

File diff suppressed because it is too large Load diff

View file

@ -5,22 +5,22 @@
php.buildComposerProject (finalAttrs: {
pname = "php-cs-fixer";
version = "3.50.0";
version = "3.51.0";
src = fetchFromGitHub {
owner = "PHP-CS-Fixer";
repo = "PHP-CS-Fixer";
rev = "v${finalAttrs.version}";
hash = "sha256-T0R/TfCLG9+Vcbsm5W8/7weI+e1RuSzTBc3VmRlG74c=";
hash = "sha256-49MzEEHFbr4jRYALdFqcQAOoQ3btoPkI9bpYJSxxnTo=";
};
# TODO: Open a PR against https://github.com/PHP-CS-Fixer/PHP-CS-Fixer
# Missing `composer.lock` from the repository.
# Issue open at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
composerLock = ./composer.lock;
vendorHash = "sha256-kcEB7UZ++ZY5vhaoPGjaC3q1fpxYcZ/yZeMP3AdQBEk=";
vendorHash = "sha256-WhLMU4aCZwNPC+k537nWQfQ0qyI/GGrR4JtgT4chuHg=";
meta = {
changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
description = "A tool to automatically fix PHP coding standards issues";
homepage = "https://cs.symfony.com/";
license = lib.licenses.mit;

View file

@ -2,6 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
# build-system
, setuptools
# dependencies
, av
, ctranslate2
@ -15,17 +18,21 @@
buildPythonPackage rec {
pname = "faster-whisper";
version = "0.10.0";
format = "setuptools";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "guillaumekln";
owner = "SYSTRAN";
repo = "faster-whisper";
rev = "refs/tags/${version}";
hash = "sha256-qcpPQv5WoUkT92/TZ+MMq452FgPNcm3ZZ+ZNc0btOGE=";
rev = "refs/tags/v${version}";
hash = "sha256-b8P9fI32ubOrdayA0vnjLhpZ4qffB6W+8TEOA1YLKqo=";
};
propagatedBuildInputs = [
build-system = [
setuptools
];
dependencies = [
av
ctranslate2
huggingface-hub

View file

@ -11,23 +11,28 @@
, pythonOlder
, pyyaml
, regex
, setuptools
, tomlkit
}:
buildPythonPackage rec {
pname = "pytest-mypy-plugins";
version = "3.0.0";
format = "setuptools";
version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "typeddjango";
repo = pname;
repo = "pytest-mypy-plugins";
rev = "refs/tags/${version}";
hash = "sha256-kIA2tVOsKsav4tRqZiWCMcRgbRnxAEo7SpmxC2pt9B0=";
hash = "sha256-FXJWOeHXeKH8kDzgujOQyu3ZtIwZ5+gc4Fxod3mRRio=";
};
nativeBuildInputs = [
setuptools
];
buildInputs = [
pytest
];

View file

@ -15,8 +15,8 @@
buildPythonPackage rec {
pname = "slither-analyzer";
version = "0.10.0";
format = "setuptools";
version = "0.10.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -24,18 +24,18 @@ buildPythonPackage rec {
owner = "crytic";
repo = "slither";
rev = "refs/tags/${version}";
hash = "sha256-lyjHubnYIwGiA6uAt9erKlTr2sCRGHQy/ZkNByFrFgM=";
hash = "sha256-MjO2ZYFat+byH0DEt2v/wPXaYL2lmlESgQCZXD4Jpt0=";
};
nativeBuildInputs = [
makeWrapper
setuptools
];
propagatedBuildInputs = [
crytic-compile
packaging
prettytable
setuptools
web3
];

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "trimesh";
version = "4.1.6";
version = "4.1.7";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ps99+3JDyKuB25G1hho6MClDFp48N/dBarHZUpcZK30=";
hash = "sha256-bO7fIrk+ScSvz1iwLMdPN+fK9T5VhIEitxdZRnLBSxA=";
};
nativeBuildInputs = [ setuptools ];

View file

@ -7,21 +7,26 @@
, platformdirs
, pytestCheckHook
, pythonOlder
, setuptools
, uritools
}:
buildPythonPackage rec {
pname = "urlextract";
version = "1.8.0";
format = "setuptools";
version = "1.9.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-NXP2uBKBTv4GykbpHoLZhO2qPNB9qqqilqRnrZiBoDc=";
hash = "sha256-cFCOArqd83LiXPBkLbNnzs4nPocSzQzngXj8XdfqANs=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
filelock
idna

View file

@ -1048,6 +1048,15 @@ let
'';
});
pathfindR = old.pathfindR.overrideAttrs (attrs: {
postPatch = ''
substituteInPlace "R/zzz.R" \
--replace-fail " check_java_version()" " Sys.setenv(JAVA_HOME = \"${lib.getBin pkgs.jre_minimal}\"); check_java_version()"
substituteInPlace "R/active_snw_search.R" \
--replace-fail "system(paste0(\"java" "system(paste0(\"${lib.getBin pkgs.jre_minimal}/bin/java"
'';
});
pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: {
postPatch = lib.optionalString stdenv.isDarwin ''
for file in R/*.{r,r.in}; do

View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.24";
version = "3.2.28";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-1v6Mft+FVEGXNQDiulpOvRy3KAD1JPkstjrURlL5r4o=";
hash = "sha256-aATdYrbejn/m55bHxXQz9Tv5V38o8K8Wu8RseCQ+uQ4=";
};
patches = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hclfmt";
version = "2.19.1";
version = "2.20.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "hcl";
rev = "v${version}";
hash = "sha256-A7YfjXdblFGBABD/PeJMzh9WdPeIUWOWAr/UlD3ki28=";
hash = "sha256-gXipXBi/IFB4F+vr1BBp91kcIRpWvxkSttb62Cl3h0g=";
};
vendorHash = "sha256-DA1IKaC+YSBzCfEMqHsHfwu1o5qvYFaFgDoGG0RZnoo=";
vendorHash = "sha256-MXiLfCbXXw2PMlj/3eAvbReH11IzS/G/4ajV37B5lOs=";
# The code repository includes other tools which are not useful. Only build
# hclfmt.

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.14.12";
version = "0.14.14";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
rev = version;
hash = "sha256-A1OoMmF1SVjOfrymenDxEgNE6K/0Tw3Gc9xBsW5jogU=";
hash = "sha256-PCToLbMDElS+YfDmHUGq3hXNA0l02dL2+4dePCHvJ8g=";
};
cargoHash = "sha256-lNLNmKVx6BfsqRm21oCUcVdkzCLEyVDrJDHSLKotSPI=";
cargoHash = "sha256-XKnuhNNTtdawFXjKn1oNLMRP4IPLaUGWyDOEwiPchhc=";
nativeBuildInputs = [
pkg-config

View file

@ -1,4 +1,4 @@
{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs
{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, fetchpatch, pkgs, wrapCDDA, attachPkgs
, tiles ? true, Cocoa
, debug ? false
, useXdgDir ? false
@ -25,6 +25,19 @@ let
patches = [
# Unconditionally look for translation files in $out/share/locale
./locale-path.patch
# Fixes for failing build with GCC 13, remove on updating next release after 0.G
(fetchpatch {
url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch";
hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch";
hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch";
hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8=";
})
];
makeFlags = common.makeFlags ++ [

View file

@ -30,6 +30,19 @@ let
patches = [
# Unconditionally look for translation files in $out/share/locale
./locale-path.patch
# Fixes for failing build with GCC 13, remove on updating next release after 0.G
(fetchpatch {
url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch";
hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch";
hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch";
hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8=";
})
];
makeFlags = common.makeFlags ++ [

View file

@ -78,7 +78,6 @@ in
extraNativeBuildInputs ? [],
extraPropagatedBuildInputs ? [],
extraCmakeFlags ? [],
meta ? {},
...
} @ args: let
# FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs,
@ -101,18 +100,6 @@ in
cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags;
separateDebugInfo = true;
meta =
{
description = projectInfo.${pname}.description;
homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}";
license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname});
maintainers = lib.teams.qt-kde.members;
# Platforms are currently limited to what upstream tests in CI, but can be extended if
# there's interest.
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
}
// meta;
};
cleanArgs = builtins.removeAttrs args [
@ -122,5 +109,17 @@ in
"extraCmakeFlags"
"meta"
];
meta = let
pos = builtins.unsafeGetAttrPos "pname" args;
in {
description = projectInfo.${pname}.description;
homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}";
license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname});
maintainers = lib.teams.qt-kde.members;
# Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest.
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
position = "${pos.file}:${toString pos.line}";
} // (args.meta or { });
in
stdenv.mkDerivation (defaultArgs // cleanArgs)
stdenv.mkDerivation (defaultArgs // cleanArgs) // { inherit meta; }

View file

@ -1,47 +0,0 @@
{ lib, stdenv, fetchurl, openssl, perl, zlib, jam }:
stdenv.mkDerivation rec {
version = "3.2.0";
pname = "archiveopteryx";
src = fetchurl {
url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2";
sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
};
nativeBuildInputs = [ jam ];
buildInputs = [ openssl perl zlib ];
preConfigure = ''
export INSTALLROOT=installroot
sed -i 's:BINDIR = $(PREFIX)/bin:BINDIR = '$out'/bin:' ./Jamsettings
sed -i 's:SBINDIR = $(PREFIX)/sbin:SBINDIR = '$out'/bin:' ./Jamsettings
sed -i 's:LIBDIR = $(PREFIX)/lib:LIBDIR = '$out'/lib:' ./Jamsettings
sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings
sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings
'';
# fix build on gcc7+ and gcc11+
env.NIX_CFLAGS_COMPILE = toString ([
"-std=c++11" # c++17+ has errors
"-Wno-error=builtin-declaration-mismatch"
"-Wno-error=deprecated-copy"
"-Wno-error=implicit-fallthrough"
"-Wno-error=nonnull"
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
"-Wno-error=mismatched-new-delete"
]);
buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
installPhase = ''
jam install
mv installroot/$out $out
'';
meta = with lib; {
homepage = "http://archiveopteryx.org/";
description = "An advanced PostgreSQL-based IMAP/POP server";
license = licenses.postgresql;
maintainers = [ maintainers.phunehehe ];
platforms = platforms.linux;
};
}

View file

@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
patches = lib.optionals stdenv.hostPlatform.isMinGW [
./mingw-install-exe-file.patch
# https://lists.nongnu.org/archive/html/lzip-bug/2024-02/msg00015.html
# patch provided by upstream, to be removed in the next release
./mingw-mkdir-one-argument.patch
];
configureFlags = [

View file

@ -0,0 +1,13 @@
--- lzip-1.24/main.cc 2024-01-26 00:08:47.000000000 +0100
+++ lzip-1.24.1/src/main.cc 2024-02-06 16:04:00.000000000 +0100
@@ -42,8 +42,10 @@
#if defined __MSVCRT__ || defined __OS2__ || defined __DJGPP__
#include <io.h>
#if defined __MSVCRT__
+#include <direct.h>
#define fchmod(x,y) 0
#define fchown(x,y,z) 0
+#define mkdir(name,mode) _mkdir(name)
#define strtoull std::strtoul
#define SIGHUP SIGTERM
#define S_ISSOCK(x) 0

View file

@ -76,6 +76,7 @@ mapAliases ({
apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12
antimicroX = antimicrox; # Added 2021-10-31
arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26
archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03
ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13
aseprite-unfree = aseprite; # Added 2023-08-26
asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16

View file

@ -25946,10 +25946,6 @@ with pkgs;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
archiveopteryx = callPackage ../servers/mail/archiveopteryx {
openssl = openssl_1_1;
};
asouldocs = callPackage ../servers/asouldocs { };
atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { };
@ -40148,7 +40144,7 @@ with pkgs;
jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };
jack_autoconnect = jack-autoconnect;
jacktrip = libsForQt5.callPackage ../applications/audio/jacktrip { };
jacktrip = callPackage ../applications/audio/jacktrip { };
j2cli = with python3Packages; toPythonApplication j2cli;