Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-09-20 00:12:01 +00:00 committed by GitHub
commit d5b3fbc677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
147 changed files with 2269 additions and 1731 deletions

View File

@ -649,15 +649,13 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
nixos-modules = {
module-system = {
members = [
ericson2314
infinisil
qyliss
roberth
];
scope = "Maintain nixpkgs module system internals.";
shortName = "NixOS Modules / internals";
scope = "Maintain the Nixpkgs module system.";
shortName = "Module system";
enableFeatureFreezePing = true;
};

View File

@ -274,7 +274,7 @@ in rec {
});
in "${out}/bin/${scriptName}";
unitConfig = { config, options, ... }: {
unitConfig = { config, name, options, ... }: {
config = {
unitConfig =
optionalAttrs (config.requires != [])
@ -294,9 +294,9 @@ in rec {
// optionalAttrs (config.requisite != [])
{ Requisite = toString config.requisite; }
// optionalAttrs (config ? restartTriggers && config.restartTriggers != [])
{ X-Restart-Triggers = "${pkgs.writeText "X-Restart-Triggers" (toString config.restartTriggers)}"; }
{ X-Restart-Triggers = "${pkgs.writeText "X-Restart-Triggers-${name}" (toString config.restartTriggers)}"; }
// optionalAttrs (config ? reloadTriggers && config.reloadTriggers != [])
{ X-Reload-Triggers = "${pkgs.writeText "X-Reload-Triggers" (toString config.reloadTriggers)}"; }
{ X-Reload-Triggers = "${pkgs.writeText "X-Reload-Triggers-${name}" (toString config.reloadTriggers)}"; }
// optionalAttrs (config.description != "") {
Description = config.description; }
// optionalAttrs (config.documentation != []) {

View File

@ -134,8 +134,8 @@ in
system.nixos-generate-config.configuration = mkDefault ''
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running `nixos-help`).
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:

View File

@ -37,8 +37,6 @@ in
environment.profileRelativeSessionVariables =
{ PATH = [ "/bin" ];
INFOPATH = [ "/info" "/share/info" ];
KDEDIRS = [ "" ];
QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ];
XDG_CONFIG_DIRS = [ "/etc/xdg" ];

View File

@ -60,10 +60,8 @@ in {
config = mkOption {
type = attrsOf (nullOr (oneOf [ bool int str ]));
default = {
config = {
ROCKET_ADDRESS = "::1"; # default to localhost
ROCKET_PORT = 8222;
};
ROCKET_ADDRESS = "::1"; # default to localhost
ROCKET_PORT = 8222;
};
example = literalExpression ''
{

View File

@ -351,6 +351,12 @@ let
new_response="$(ykchalresp -${toString dev.yubikey.slot} -x $new_challenge 2>/dev/null)"
if [ -z "$new_response" ]; then
echo "Warning: Unable to generate new challenge response, current challenge persists!"
umount /crypt-storage
return
fi
if [ ! -z "$k_user" ]; then
new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)"
else

View File

@ -66,7 +66,7 @@ in
};
services.resolved.dnssec = mkOption {
default = "allow-downgrade";
default = "false";
example = "true";
type = types.enum [ "true" "allow-downgrade" "false" ];
description = lib.mdDoc ''
@ -85,6 +85,12 @@ in
synthesizing a DNS response that suggests DNSSEC was not
supported.
- `"false"`: DNS lookups are not DNSSEC validated.
At the time of September 2023, systemd upstream advise
to disable DNSSEC by default as the current code
is not robust enough to deal with "in the wild" non-compliant
servers, which will usually give you a broken bad experience
in addition of insecure.
'';
};

View File

@ -32,6 +32,7 @@ let
linux_5_15_hardened
linux_6_1_hardened
linux_6_4_hardened
linux_6_5_hardened
linux_rt_5_4
linux_rt_5_10
linux_rt_5_15

View File

@ -67,7 +67,7 @@ rec {
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
}) {} [
"6_1" "6_2"
"6_1" "6_2" "6_3"
];
testScript = ''

View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "musikcube";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
hash = "sha512-ahKPmChHRVpOQcgt0fOYumlsMApeN4MWwywE9F0edeN0Xr3Vp830mWGzEBJvMvGI/lnU/1rd7tREaHfm1vCJaw==";
hash = "sha512-IakZy6XsAE39awjzQI+R11JCPeQSaibx6+uX8Iea5WdlCundeovnPwSAi6RzzZl9dr2UftzzEiF4Aun8VMtqVA==";
};
outputs = [ "out" "dev" ];
@ -85,11 +85,11 @@ stdenv.mkDerivation rec {
install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d
'';
meta = with lib; {
meta = {
description = "Terminal-based music player, library, and streaming audio server";
homepage = "https://musikcube.com/";
maintainers = with maintainers; [ aanderse srapenne afh ];
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with lib.maintainers; [ aanderse srapenne afh ];
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
};
}

View File

@ -16,13 +16,13 @@ assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
version = "0.48";
version = "0.49";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
sha256 = "sha256-89hBaWFwMPBqSWDmsXND0PEc1a9Fte+p1ho5tWuZFlY=";
sha256 = "sha256-rqIlQQ9RhFrhPwUd9dZmMZiqwFinNoV46VaJ3pbyUI8=";
};
buildInputs = [ glib ncurses libmpdclient boost ]

View File

@ -3,6 +3,7 @@
, fetchurl
, autoreconfHook
, pkg-config
, installShellFiles
, util-linux
, hexdump
, autoSignDarwinBinariesHook
@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs =
[ autoreconfHook pkg-config ]
[ autoreconfHook pkg-config installShellFiles ]
++ lib.optionals stdenv.isLinux [ util-linux ]
++ lib.optionals stdenv.isDarwin [ hexdump ]
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
@ -53,7 +54,19 @@ stdenv.mkDerivation rec {
++ lib.optionals withWallet [ db48 sqlite ]
++ lib.optionals withGui [ qrencode qtbase qttools ];
postInstall = lib.optionalString withGui ''
postInstall = ''
installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion
installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion
installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion
installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish
installShellCompletion --fish contrib/completions/fish/bitcoind.fish
installShellCompletion --fish contrib/completions/fish/bitcoin-tx.fish
installShellCompletion --fish contrib/completions/fish/bitcoin-util.fish
installShellCompletion --fish contrib/completions/fish/bitcoin-wallet.fish
'' + lib.optionalString withGui ''
installShellCompletion --fish contrib/completions/fish/bitcoin-qt.fish
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin"
install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png

View File

@ -14,13 +14,13 @@
buildDotnetModule rec {
pname = "denaro";
version = "2023.9.1";
version = "2023.9.2";
src = fetchFromGitHub {
owner = "NickvisionApps";
repo = "Denaro";
rev = version;
hash = "sha256-WODAdIKCnDaOWmLir1OfYfAUaULwV8yEFMlfyO/cmfE=";
hash = "sha256-3Atdi0R7OHpP1HUBWGu2Y4L8hr9jLPMIFYCEWeoEq6A=";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View File

@ -2,6 +2,7 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.1.0"; sha256 = "03rs3f71vgzk3pp0mx83rx6aqg2aq7xwk0p42mj5701m3592x49d"; })
(fetchNuGet { pname = "Cake.Tool"; version = "3.1.0"; sha256 = "1kv9zz0qsx40wiygydw5z6vkj8hfayvgy9bsii2lamdas9z0vmbc"; })
(fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; })
(fetchNuGet { pname = "FuzzySharp"; version = "2.0.2"; sha256 = "1xq3q4s9d5p1yn4j91a90hawk9wcrz1bl6zj9866y01yx9aamr8s"; })
@ -31,13 +32,14 @@
(fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-beta.910"; sha256 = "0yw54yd1kp4j8js1g405m4lvv84zx4zkx4m64iiqsc765a4alvvy"; })
(fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-beta.910"; sha256 = "1ifhvcsa0319mip98xbmlib3k7fkn24igfxxyfi2d31rajqv970r"; })
(fetchNuGet { pname = "Markdig"; version = "0.31.0"; sha256 = "0iic44i47wp18jbbpl44iifhj2mfnil9gakkw3bzp7zif3rhl19m"; })
(fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.2"; sha256 = "0x7xlym8jsm0zgbb75ip74gnw3fssb30phc48xf35yx6i0sfb2dh"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.5"; sha256 = "11gkdlf2apnzvwfd7bxdhjvb4qd0p2ridp4rrz44f7h76x1sb0gk"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "Nickvision.Aura"; version = "2023.9.1"; sha256 = "sha256-+6CXO7K/liVUHFPwdBUEUi2r5d5+/cHfoiZ15xURBBg="; })
(fetchNuGet { pname = "Nickvision.Aura"; version = "2023.9.3"; sha256 = "0j3fqjl8nskqqwmkc41h3pgnvl63nq9w443b571j154xibly5iw7"; })
(fetchNuGet { pname = "Nickvision.GirExt"; version = "2023.7.3"; sha256 = "1ahf4mld9khk2gaja30zfcjmhclz2l2nims0q4l7jk2nm9p7rzi9"; })
(fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; })
(fetchNuGet { pname = "PdfSharpCore"; version = "1.3.56"; sha256 = "0a01b2a14gygh25rq3509rky85331l8808q052br2fzidhb2vc10"; })
@ -93,6 +95,7 @@
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
@ -135,4 +138,5 @@
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
(fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; sha256 = "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"; })
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; })
]

View File

@ -14,19 +14,19 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "21.6.8";
version = "21.7.5";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-k16npV8N4zPIXjc8ZJcQHgv76h2VhbqtT2ZCzDqkF8U";
hash = "sha256-hf1sektdnW4c3dySun8sQ9vBrAqTocrLFAIYkemNC3I=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-rJvwXhtO/HsfpbDyOh+jFc6E9wQ+sZMT8vnhJpGlkF8";
hash = "sha256-FVZq/voCjnRSBLtQtJkJbErGvprEHq+U/VZ9rEwbJsI=";
};
nativeBuildInputs = [

View File

@ -11,10 +11,10 @@ buildGoModule rec {
owner = "mholt";
repo = pname;
rev = "v${version}";
sha256 = "1py186hfy4p69wghqmbsyi1r3xvw1nyl55pz8f97a5qhmwxb3mwp";
hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8=";
};
vendorSha256 = "1y4v95z1ga111g3kdv5wvyikwifl25f36firf1i916rxli6f6g5i";
vendorHash = "sha256-sTzjTKQ9m5BicDk6M1wR1EU+o9+87DbHCyGoF35Jm/g=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "harsh";
version = "0.8.28";
version = "0.8.29";
src = fetchFromGitHub {
owner = "wakatara";
repo = pname;
rev = "v${version}";
hash = "sha256-6BeGyyy4RFBy4TvB3bLTyDtQGljG9xE3VFfbnq9KWcs=";
hash = "sha256-LftLlKevxvjxnRUMaRXnh3TXQSauvnfuX6voglwZmZE=";
};
vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4=";

View File

@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
version = "2.0.2.16660";
version = "2.0.3.17006";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
sha256 = "sha256-iz9bUkeQZs0k3whRZuIl/KtSn7KlTq1urQ2I+D292MM=";
sha256 = "sha256-jZzGoeYv9HxuJmHrQKm5kgReARaoMr2kPe+SWkWOBAw=";
stripRoot = false;
};

View File

@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
version = "2.5.0";
version = "2.5.4";
format = "other";
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = pname;
rev = "v${version}";
hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA=";
hash = "sha256-2+ZY+ca/CTIdCiFrBOkMWKflzKjSYJ8yfwFkULNg7Xk=";
};
nativeBuildInputs = [

View File

@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4910";
version = "4912";
src = fetchsvn {
url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
rev = version;
sha256 = "sha256-t4SyvDvwNdqKh95MRmHxlX6q84dN0y4ANPIXqS7ynBA=";
sha256 = "sha256-4A6N0bhRLKgpLXUSN1iAmIC4YX+BaiUow2YQqnxguRM=";
};
patches = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sway-launcher-desktop";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "Biont";
repo = "sway-launcher-desktop";
rev = "v${version}";
sha256 = "HCGUFXrj6b9Pb6b5y9yupBumFLQyH1QVMrfoBM4HbMg=";
hash = "sha256-lv1MLPJsJJjm6RLzZXWEz1JO/4EXTQ8wj225Di+98G4=";
};
postPatch = ''

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.15.7";
version = "0.15.8";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
hash = "sha256-kQpQszKyesM9qFlpgwYElrC9B4YBig62Pf9FoZJ2epM=";
hash = "sha256-iIE4jqvlkgf8+IrP0t+o0bZwlB5v61HzbyQy6ExAobE=";
};
vendorHash = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.31.2";
version = "0.32.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-QBJ8UoR61XOFT6u5glpL+DHaj5Kyqq73r0pyteINQNA=";
sha256 = "sha256-Ilue0stXko8bkMMzXEHrdgJYIV5ZcI39hwFUya8X4ac=";
};
vendorHash = null;

View File

@ -14,17 +14,17 @@ let
in
flutter.buildFlutterApplication rec {
pname = "fluffychat";
version = "1.13.0";
version = "1.14.1";
src = fetchFromGitHub {
owner = "krille-chan";
repo = "fluffychat";
rev = "refs/tags/v${version}";
hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc=";
hash = "sha256-VTpZvoyZXJ5SCKr3Ocfm4iT6Z/+AWg+SCw/xmp68kMg=";
};
depsListFile = ./deps.json;
vendorHash = "sha256-dkH+iI1KLsAJtSt6ndc3ZRBllZ9n21RNONqeeUzNQCE=";
vendorHash = "sha256-uGrz7QwETZGlwLbfKr1vDo0p/emK1ZCjCX2w0nNVJsA=";
desktopItem = makeDesktopItem {
name = "Fluffychat";

View File

@ -1,7 +1,7 @@
[
{
"name": "fluffychat",
"version": "1.13.0+3514",
"version": "1.14.1+3516",
"kind": "root",
"source": "root",
"dependencies": [
@ -47,14 +47,13 @@
"flutter_webrtc",
"future_loading_dialog",
"geolocator",
"handy_window",
"go_router",
"hive",
"hive_flutter",
"http",
"image_picker",
"intl",
"just_audio",
"just_audio_mpv",
"keyboard_shortcuts",
"latlong2",
"linkify",
@ -85,7 +84,6 @@
"vibration",
"video_compress",
"video_player",
"vrouter",
"wakelock",
"webrtc_interface",
"dart_code_metrics",
@ -113,7 +111,7 @@
},
{
"name": "win32",
"version": "5.0.5",
"version": "5.0.6",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -122,7 +120,7 @@
},
{
"name": "ffi",
"version": "2.0.2",
"version": "2.1.0",
"kind": "transitive",
"source": "hosted",
"dependencies": []
@ -227,7 +225,7 @@
},
{
"name": "plugin_platform_interface",
"version": "2.1.4",
"version": "2.1.5",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -320,7 +318,7 @@
},
{
"name": "msix",
"version": "3.15.0",
"version": "3.16.1",
"kind": "dev",
"source": "hosted",
"dependencies": [
@ -397,7 +395,7 @@
},
{
"name": "archive",
"version": "3.3.7",
"version": "3.3.9",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -730,7 +728,7 @@
},
{
"name": "flutter_native_splash",
"version": "2.3.1",
"version": "2.3.2",
"kind": "dev",
"source": "hosted",
"dependencies": [
@ -810,7 +808,7 @@
},
{
"name": "dart_code_metrics",
"version": "5.7.5",
"version": "5.7.6",
"kind": "dev",
"source": "hosted",
"dependencies": [
@ -969,7 +967,7 @@
},
{
"name": "webrtc_interface",
"version": "1.1.0",
"version": "1.1.1",
"kind": "direct",
"source": "hosted",
"dependencies": []
@ -1012,26 +1010,116 @@
]
},
{
"name": "vrouter",
"version": "1.2.1",
"name": "video_player",
"version": "2.7.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter",
"url_strategy",
"url_launcher",
"move_to_background"
"html",
"video_player_android",
"video_player_avfoundation",
"video_player_platform_interface",
"video_player_web"
]
},
{
"name": "move_to_background",
"version": "1.0.2",
"name": "video_player_web",
"version": "2.0.16",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"flutter_web_plugins",
"video_player_platform_interface"
]
},
{
"name": "video_player_platform_interface",
"version": "6.2.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"plugin_platform_interface"
]
},
{
"name": "video_player_avfoundation",
"version": "2.4.9",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"video_player_platform_interface"
]
},
{
"name": "video_player_android",
"version": "2.4.9",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"video_player_platform_interface"
]
},
{
"name": "video_compress",
"version": "3.1.2",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter"
]
},
{
"name": "vibration",
"version": "1.8.1",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter",
"device_info_plus"
]
},
{
"name": "device_info_plus",
"version": "9.0.3",
"kind": "direct",
"source": "hosted",
"dependencies": [
"device_info_plus_platform_interface",
"ffi",
"file",
"flutter",
"flutter_web_plugins",
"meta",
"win32",
"win32_registry"
]
},
{
"name": "win32_registry",
"version": "1.1.1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"ffi",
"win32"
]
},
{
"name": "device_info_plus_platform_interface",
"version": "7.0.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"meta",
"plugin_platform_interface"
]
},
{
"name": "url_launcher",
"version": "6.1.12",
@ -1081,7 +1169,7 @@
},
{
"name": "url_launcher_macos",
"version": "3.0.5",
"version": "3.0.6",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1111,7 +1199,7 @@
},
{
"name": "url_launcher_android",
"version": "6.0.36",
"version": "6.0.38",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1119,126 +1207,6 @@
"url_launcher_platform_interface"
]
},
{
"name": "url_strategy",
"version": "0.2.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter_web_plugins"
]
},
{
"name": "video_player",
"version": "2.7.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter",
"html",
"video_player_android",
"video_player_avfoundation",
"video_player_platform_interface",
"video_player_web"
]
},
{
"name": "video_player_web",
"version": "2.0.16",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"flutter_web_plugins",
"video_player_platform_interface"
]
},
{
"name": "video_player_platform_interface",
"version": "6.1.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"plugin_platform_interface"
]
},
{
"name": "video_player_avfoundation",
"version": "2.4.6",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"video_player_platform_interface"
]
},
{
"name": "video_player_android",
"version": "2.4.9",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"video_player_platform_interface"
]
},
{
"name": "video_compress",
"version": "3.1.2",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter"
]
},
{
"name": "vibration",
"version": "1.8.1",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter",
"device_info_plus"
]
},
{
"name": "device_info_plus",
"version": "9.0.2",
"kind": "direct",
"source": "hosted",
"dependencies": [
"device_info_plus_platform_interface",
"ffi",
"file",
"flutter",
"flutter_web_plugins",
"meta",
"win32",
"win32_registry"
]
},
{
"name": "win32_registry",
"version": "1.1.1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"ffi",
"win32"
]
},
{
"name": "device_info_plus_platform_interface",
"version": "7.0.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"meta",
"plugin_platform_interface"
]
},
{
"name": "universal_html",
"version": "2.2.3",
@ -1277,7 +1245,7 @@
},
{
"name": "unifiedpush_android",
"version": "2.1.1",
"version": "2.1.2",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1337,7 +1305,7 @@
},
{
"name": "path_provider_windows",
"version": "2.1.7",
"version": "2.2.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1350,7 +1318,7 @@
},
{
"name": "path_provider_platform_interface",
"version": "2.0.6",
"version": "2.1.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1386,7 +1354,7 @@
},
{
"name": "path_provider_linux",
"version": "2.1.11",
"version": "2.2.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1399,18 +1367,17 @@
},
{
"name": "xdg_directories",
"version": "1.0.0",
"version": "1.0.2",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"meta",
"path",
"process"
"path"
]
},
{
"name": "shared_preferences_foundation",
"version": "2.3.1",
"version": "2.3.3",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1488,7 +1455,7 @@
},
{
"name": "share_plus",
"version": "7.0.2",
"version": "7.1.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -1509,7 +1476,7 @@
},
{
"name": "share_plus_platform_interface",
"version": "3.2.1",
"version": "3.3.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1524,7 +1491,7 @@
},
{
"name": "path_provider",
"version": "2.0.15",
"version": "2.1.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -1538,7 +1505,7 @@
},
{
"name": "path_provider_foundation",
"version": "2.2.3",
"version": "2.3.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1548,7 +1515,7 @@
},
{
"name": "path_provider_android",
"version": "2.0.27",
"version": "2.1.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1726,7 +1693,7 @@
},
{
"name": "permission_handler",
"version": "10.4.2",
"version": "10.4.3",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -1740,7 +1707,7 @@
},
{
"name": "permission_handler_platform_interface",
"version": "3.11.1",
"version": "3.11.3",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1761,7 +1728,7 @@
},
{
"name": "permission_handler_apple",
"version": "9.1.3",
"version": "9.1.4",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1771,7 +1738,7 @@
},
{
"name": "permission_handler_android",
"version": "10.3.0",
"version": "10.3.3",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -1792,7 +1759,7 @@
},
{
"name": "package_info_plus",
"version": "4.0.2",
"version": "4.1.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -1857,7 +1824,7 @@
},
{
"name": "matrix",
"version": "0.22.2",
"version": "0.22.3",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -2028,44 +1995,6 @@
"flutter"
]
},
{
"name": "just_audio_mpv",
"version": "0.1.6",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter",
"just_audio_platform_interface",
"mpv_dart"
]
},
{
"name": "mpv_dart",
"version": "0.0.1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"eventify",
"path"
]
},
{
"name": "eventify",
"version": "1.0.1",
"kind": "transitive",
"source": "hosted",
"dependencies": []
},
{
"name": "just_audio_platform_interface",
"version": "4.2.1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"plugin_platform_interface"
]
},
{
"name": "just_audio",
"version": "0.9.34",
@ -2115,9 +2044,19 @@
"flutter_web_plugins"
]
},
{
"name": "just_audio_platform_interface",
"version": "4.2.1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
"flutter",
"plugin_platform_interface"
]
},
{
"name": "image_picker",
"version": "1.0.0",
"version": "1.0.2",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -2145,7 +2084,7 @@
},
{
"name": "image_picker_platform_interface",
"version": "2.8.0",
"version": "2.9.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -2192,7 +2131,7 @@
},
{
"name": "file_selector_macos",
"version": "0.9.3",
"version": "0.9.3+1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -2236,7 +2175,7 @@
},
{
"name": "image_picker_for_web",
"version": "2.2.0",
"version": "3.0.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -2248,7 +2187,7 @@
},
{
"name": "image_picker_android",
"version": "0.8.7+3",
"version": "0.8.7+4",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -2279,14 +2218,25 @@
]
},
{
"name": "handy_window",
"version": "0.3.1",
"name": "go_router",
"version": "10.1.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
"flutter"
"collection",
"flutter",
"flutter_web_plugins",
"logging",
"meta"
]
},
{
"name": "logging",
"version": "1.2.0",
"kind": "transitive",
"source": "hosted",
"dependencies": []
},
{
"name": "geolocator",
"version": "7.7.1",
@ -2332,7 +2282,7 @@
},
{
"name": "flutter_webrtc",
"version": "0.9.37",
"version": "0.9.40",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -2345,7 +2295,7 @@
},
{
"name": "dart_webrtc",
"version": "1.1.1",
"version": "1.1.2",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -2907,7 +2857,7 @@
},
{
"name": "sqflite",
"version": "2.2.8+4",
"version": "2.3.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -2918,7 +2868,7 @@
},
{
"name": "sqflite_common",
"version": "2.4.5+1",
"version": "2.5.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -2963,7 +2913,7 @@
},
{
"name": "file_picker",
"version": "5.3.2",
"version": "5.3.3",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -3072,7 +3022,7 @@
},
{
"name": "connectivity_plus",
"version": "4.0.1",
"version": "4.0.2",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -3119,7 +3069,7 @@
},
{
"name": "wakelock_plus",
"version": "1.1.0",
"version": "1.1.1",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -3155,7 +3105,7 @@
},
{
"name": "badges",
"version": "2.0.3",
"version": "3.1.1",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -3173,7 +3123,7 @@
},
{
"name": "adaptive_dialog",
"version": "1.9.0-x-macos-beta.1",
"version": "1.9.0",
"kind": "direct",
"source": "hosted",
"dependencies": [
@ -3188,7 +3138,7 @@
},
{
"name": "macos_ui",
"version": "2.0.0-beta.6",
"version": "2.0.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [
@ -3198,7 +3148,7 @@
},
{
"name": "macos_window_utils",
"version": "1.1.3",
"version": "1.2.0",
"kind": "transitive",
"source": "hosted",
"dependencies": [

View File

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230914-1";
version = "20230919";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-Ixmsodhbtf8W7Tjaxb7t9tX05A4rL93t9XZFnpcqQ4M=";
hash = "sha256-/Nz+T3ePjabETFrN8fq+JI5g18UEQmmqiJ0XAMR+gzM=";
};
postPatch = ''

View File

@ -12,13 +12,13 @@
let
thunderbird-unwrapped = thunderbirdPackages.thunderbird-102;
version = "102.15.0";
version = "102.15.1";
majVer = lib.versions.major version;
betterbird-patches = fetchFromGitHub {
owner = "Betterbird";
repo = "thunderbird-patches";
rev = "${version}-bb40";
rev = "${version}-bb41";
postFetch = ''
echo "Retrieving external patches"
@ -36,7 +36,7 @@ let
. ./external.sh
rm external.sh
'';
hash = "sha256-7/JEcP76rp0hSSxzlIlHqkcxTSEJQswFhCoOLYntQ5I=";
hash = "sha256-fP763ec4B8LbivzmYHzQ4j39QMxWrymqI8chXfF3KX8=";
};
in ((buildMozillaMach {
pname = "betterbird";
@ -49,7 +49,7 @@ in ((buildMozillaMach {
src = fetchurl {
# https://download.cdn.mozilla.net/pub/thunderbird/releases/
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "11d4c77049c532753c9b693d69ab9a0bcd0eb13d49f87a511ad8ba680b70041ac6f64c5f9cd5dd44246d46e7695d9bd51146b1fe62b0b7c9fbc862eb53d5cfda";
hash = "sha256-og1Tu7PAHOqGs02jkHU291BCGuKDy1J+72v4Gsu4oDg=";
};
extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''

View File

@ -4,7 +4,7 @@
, rustPlatform
, fetchFromGitHub
, substituteAll
, fetchpatch
, just
, pkg-config
, wrapGAppsHook4
, cairo
@ -20,25 +20,18 @@
, rclone
}:
let
# https://github.com/trevyn/librclone/pull/8
librclone-mismatched-types-patch = fetchpatch {
name = "use-c_char-to-be-platform-independent.patch";
url = "https://github.com/trevyn/librclone/commit/91fdf3fa5f5eea0dfd06981ba72e09034974fdad.patch";
hash = "sha256-8YDyUNP/ISP5jCliT6UCxZ89fdRFud+6u6P29XdPy58=";
};
in rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage rec {
pname = "celeste";
version = "0.5.2";
version = "0.5.8";
src = fetchFromGitHub {
owner = "hwittenborn";
repo = "celeste";
rev = "v${version}";
hash = "sha256-pFtyfKGPlwum/twGXi/e82BjINy6/MMvvmVfrwWHTQg=";
hash = "sha256-U/6aqQig+uuWj/B9CODnV6chxY+KfMH7DqnPtSTDSA0=";
};
cargoHash = "sha256-wcgu4KApkn68Tpk3PQ9Tkxif++/8CmS4f8AOOpCA/X8=";
cargoHash = "sha256-69LK/oicfmSPbUGGzWV9kvXkHqMvEzCG8xCu61MxSdk=";
patches = [
(substituteAll {
@ -56,12 +49,11 @@ in rustPlatform.buildRustPackage rec {
substituteInPlace .cargo-checksum.json \
--replace $oldHash $(sha256sum build.rs | cut -d " " -f 1)
popd
pushd $cargoDepsCopy/librclone
oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
patch -p1 < ${librclone-mismatched-types-patch}
substituteInPlace .cargo-checksum.json \
--replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
popd
substituteInPlace justfile \
--replace "{{ env_var('DESTDIR') }}/usr" "${placeholder "out"}"
# buildRustPackage takes care of installing the binary
sed -i "#/bin/celeste#d" justfile
'';
# Cargo.lock is outdated
@ -80,6 +72,7 @@ in rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
just
pkg-config
rustPlatform.bindgenHook
wrapGAppsHook4
@ -104,6 +97,10 @@ in rustPlatform.buildRustPackage rec {
)
'';
postInstall = ''
just install
'';
meta = {
changelog = "https://github.com/hwittenborn/celeste/blob/${src.rev}/CHANGELOG.md";
description = "GUI file synchronization client that can sync with any cloud provider";

View File

@ -2,14 +2,14 @@
nimPackages.buildNimPackage rec {
pname = "mosdepth";
version = "0.3.4";
version = "0.3.5";
nimBinOnly = true;
src = fetchFromGitHub {
owner = "brentp";
repo = "mosdepth";
rev = "v${version}";
sha256 = "sha256-7uteYTCbAaXedPqk0WtHpqTfUWH/+rRW8aSlFixkEko=";
sha256 = "sha256-tG3J51PS6A0WBCZ+j/Nf7aaukFV+DZJsxpbTbvwu0zc=";
};
buildInputs = [ docopt hts pcre ];

View File

@ -43,16 +43,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "rio";
version = "0.0.18";
version = "0.0.19";
src = fetchFromGitHub {
owner = "raphamorim";
repo = "rio";
rev = "v${version}";
hash = "sha256-/zqJQQLpwYil4BBZJDMMC8JRAEG0vGeG0dCDzLzPk/o=";
hash = "sha256-N7eHIyp2imkMUVwiOCameOROoaDJ7g+zNKdIB2aGZy0=";
};
cargoHash = "sha256-jev4fMwCygVzvrkI1nSE5tx59nGqNKQUHCNHvkr9R90=";
cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo=";
nativeBuildInputs = [
autoPatchelfHook
@ -78,6 +78,10 @@ rustPlatform.buildRustPackage rec {
];
postInstall = ''
install -D -m 644 misc/rio.desktop -t $out/share/applications
install -D -m 644 rio/src/screen/window/resources/images/logo.png \
$out/share/icons/hicolor/scalable/apps/rio.png
install -dm 755 "$terminfo/share/terminfo/r/"
tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
mkdir -p $out/nix-support

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "2.34.0";
version = "2.35.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-Bb0vEaMOjgQ5p9r/tfciKo4/MXjUCUIdoDSB/Bido/8=";
hash = "sha256-ddVszWyfu9BsP4yvOtVTHhZ51D8j4Vf1pdyahF0gjVk=";
};
vendorHash = "sha256-iql/CEWwg6t5k8qOFEQotMUUJd4VQ/H4JcuL2Eunqg0=";

View File

@ -1,15 +1,15 @@
{
"version": "16.3.3",
"repo_hash": "sha256-+h3ksxuphegTvjrKTWk68fgan1n2g64b1sn5nMoYhLc=",
"version": "16.3.4",
"repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=",
"yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.3.3-ee",
"rev": "v16.3.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.3.3",
"GITLAB_PAGES_VERSION": "16.3.3",
"GITALY_SERVER_VERSION": "16.3.4",
"GITLAB_PAGES_VERSION": "16.3.4",
"GITLAB_SHELL_VERSION": "14.26.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8",
"GITLAB_WORKHORSE_VERSION": "16.3.3"
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10",
"GITLAB_WORKHORSE_VERSION": "16.3.4"
}
}

View File

@ -13,7 +13,7 @@
}:
let
version = "16.3.3";
version = "16.3.4";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -24,7 +24,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-V9uh5QkvQ1ifO5DNCivg47NBjgE06Ehz7DnmBeU3lVY=";
hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg=";
};
vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0=";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.3.3";
version = "16.3.4";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-TPXMXuxckALObfEcIguJbGToIGp8b2bpd974epaXpyk=";
hash = "sha256-hz5YCQi1O+/ana/Vpawh2nQj7fmcI6huvKFTG9rVDjw=";
};
vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM=";

View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.3.3";
version = "16.3.4";
src = fetchFromGitLab {
owner = data.owner;

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.92";
version = "0.93";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
hash = "sha256-HaNCxgbl0ewvI96jr9/BgJphqoQC5P2atj5a51bj99c=";
hash = "sha256-wlcnJr7f3Bd9SEgrKiPlr7pTSjaRj47qwktI2jepINE=";
};
nativeBuildInputs = [ pkg-config bison ]
@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
on the same repository.
'';
homepage = "https://gameoftrees.org";
changelog = "https://gameoftrees.org/releases/CHANGES";
license = licenses.isc;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ abbe afh ];

View File

@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "obs-vkcapture";
version = "1.4.1";
version = "1.4.3";
src = fetchFromGitHub {
owner = "nowrep";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-1M/lchsrHG01C18GXfiIcclovdHKHrHMVsPvIJ+oB+M=";
hash = "sha256-hFweWZalWMGbGXhM6uxaGoWkr9srqxRChJo5yUBiBXs=";
};
cmakeFlags = lib.optionals stdenv.isi686 [

View File

@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec {
cargoTestFlags = [
"--workspace"
"--bins" "--lib" # Integration tests require root.
"--exclude" "net_util" # Tries to access /dev/net/tun
"--exclude" "net_util" # /dev/net/tun
"--exclude" "vmm" # /dev/kvm
];
meta = with lib; {

View File

@ -41,7 +41,7 @@ composerInstallBuildHook() {
# Since this file cannot be generated in the composer-repository-hook.sh
# because the file contains hardcoded nix store paths, we generate it here.
composer-local-repo-plugin --no-ansi build-local-repo -p "${composerRepository}" > packages.json
composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" .
# Remove all the repositories of type "composer"
# from the composer.json file.

View File

@ -27,13 +27,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "composer-local-repo-plugin";
version = "1.0.0";
version = "1.0.2";
src = fetchFromGitHub {
owner = "nix-community";
repo = "composer-local-repo-plugin";
rev = finalAttrs.version;
hash = "sha256-sjWV4JXK8YJ5XLASMPipKlk9u57352wIDV2PPFIP+sk=";
hash = "sha256-L1DPAINlYiC/HdcgDpI72OI58v8LWfhZVuS1vtNDnEw=";
};
COMPOSER_CACHE_DIR = "/dev/null";

View File

@ -1,13 +1,12 @@
{ lib
, buildGoModule
, fetchFromGitHub
, runCommand
, callPackage
}:
let
pname = "elvish";
version = "0.19.2";
shellPath = "/bin/elvish";
in
buildGoModule {
inherit pname version;
@ -32,26 +31,12 @@ buildGoModule {
strictDeps = true;
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out${shellPath} -c "
fn expect {|key expected|
var actual = \$buildinfo[\$key]
if (not-eq \$actual \$expected) {
fail '\$buildinfo['\$key']: expected '(to-string \$expected)', got '(to-string \$actual)
}
}
expect version ${version}
"
runHook postInstallCheck
'';
passthru = {
inherit shellPath;
shellPath = "/bin/elvish";
tests = {
expectVersion = callPackage ./tests/expect-version.nix { };
};
};
meta = {
@ -63,6 +48,6 @@ buildGoModule {
status, it is already suitable for most daily interactive use.
'';
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ vrthra AndersonTorres ];
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

View File

@ -0,0 +1,8 @@
fn expect {|key expected|
var actual = $buildinfo[$key]
if (not-eq $actual $expected) {
fail '$buildinfo['$key']: expected '(to-string $expected)', got '(to-string $actual)
}
}
expect version @version@

View File

@ -0,0 +1,25 @@
{ lib
, stdenv
, elvish
, substituteAll
}:
stdenv.mkDerivation {
pname = "elvish-simple-test";
inherit (elvish) version;
nativeBuildInputs = [ elvish ];
dontInstall = true;
buildCommand = ''
elvish ${substituteAll {
src = ./expect-version.elv;
inherit (elvish) version;
}}
touch $out
'';
meta.timeout = 10;
}

View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchurl
, ncurses
, pcre2
}:
stdenv.mkDerivation (finalAttrs: {
pname = "less";
version = "643";
# Only tarballs on the website are valid releases,
# other versions, e.g. git tags are considered snapshots.
src = fetchurl {
url = "https://www.greenwoodsoftware.com/less/less-${finalAttrs.version}.tar.gz";
hash = "sha256-KRG1QyyDb6CEyKLmj2zWMSNywCalj6qpiGJzHItgUug=";
};
buildInputs = [
ncurses
pcre2
];
outputs = [ "out" "man" ];
configureFlags = [
# Look for 'sysless' in /etc.
"--sysconfdir=/etc"
"--with-regex=pcre2"
];
meta = {
homepage = "https://www.greenwoodsoftware.com/less/";
description = "A more advanced file pager than 'more'";
changelog = "https://www.greenwoodsoftware.com/less/news.${finalAttrs.version}.html";
license = lib.licenses.gpl3Plus;
mainProgram = "less";
maintainers = with lib.maintainers; [ eelco dtzWill ];
platforms = lib.platforms.unix;
};
})

View File

@ -4,19 +4,20 @@
, installShellFiles
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mksh";
version = "59c";
src = fetchurl {
urls = [
"http://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz"
"http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz"
"http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${finalAttrs.version}.tgz"
"http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${finalAttrs.version}.tgz"
];
hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY=";
};
strictDeps = true;
nativeBuildInputs = [
installShellFiles
];
@ -37,7 +38,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = with lib; {
passthru = {
shellPath = "/bin/mksh";
};
meta = {
homepage = "http://www.mirbsd.org/mksh.htm";
description = "MirBSD Korn Shell";
longDescription = ''
@ -47,14 +52,10 @@ stdenv.mkDerivation rec {
also to be readily available under other UNIX(R)-like operating
systems.
'';
license = with licenses; [ miros isc unicode-dfs-2016 ];
maintainers = with maintainers; [ AndersonTorres joachifm ];
platforms = platforms.unix;
license = with lib.licenses; [ miros isc unicode-dfs-2016 ];
maintainers = with lib.maintainers; [ AndersonTorres joachifm ];
platforms = lib.platforms.unix;
};
passthru = {
shellPath = "/bin/mksh";
};
}
})
# TODO [ AndersonTorres ]: lksh
# TODO [ AndersonTorres ]: a more accurate licensing info

View File

@ -0,0 +1,52 @@
{ lib
, python3
, fetchFromGitHub
, lit
}:
python3.pkgs.buildPythonApplication rec {
pname = "outputcheck";
version = "0.4.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "stp";
repo = "OutputCheck";
rev = "eab62a5dd5129f6a4ebfbe4bbe41d35611f7c48d";
hash = "sha256-0D5Lljn66jB/EW/ntC2eTuXAt0w0cceeeqf3aKuyeF0=";
};
# - Fix deprecated 'U' mode in python 3.11
# https://github.com/python/cpython/blob/3.11/Doc/library/functions.rst?plain=1#L1386
# - Fix expected error and actual parser error mismatch
# - Fix version number cannot find error
postPatch = ''
substituteInPlace OutputCheck/Driver.py \
--replace "argparse.FileType('rU')" "argparse.FileType('r')"
substituteInPlace tests/invalid-regex-syntax.smt2 \
--replace "unbalanced parenthesis" "missing ), unterminated subpattern"
echo ${version} > RELEASE-VERSION
'';
nativeCheckInputs = [ lit ];
checkPhase = ''
runHook preCheck
lit -v tests/
runHook postCheck
'';
pythonImportsCheck = [ "OutputCheck" ];
meta = with lib; {
description = "A tool for checking tool output inspired by LLVM's FileCheck";
homepage = "https://github.com/stp/OutputCheck";
license = licenses.bsd3;
maintainers = with maintainers; [ fsagbuya ];
mainProgram = "OutputCheck";
};
}

View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zpaqfranz";
version = "58.9";
src = fetchFromGitHub {
owner = "fcorbelli";
repo = "zpaqfranz";
rev = finalAttrs.version;
hash = "sha256-R7LA7gu2q2Kk+FPCLZedwrlICk6OUao/EJHEvxA1+Nc=";
};
nativeBuildInputs = [
installShellFiles
];
buildPhase = ''
runHook preBuild
eval $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -Dunix zpaqfranz.cpp -o zpaqfranz -pthread
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 zpaqfranz -t $out/bin/
installManPage man/zpaqfranz.1
runHook postInstall
'';
meta = {
homepage = "https://github.com/fcorbelli/zpaqfranz";
description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
})

View File

@ -4,11 +4,11 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "commit-mono";
version = "1.136";
version = "1.138";
src = fetchzip {
url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip";
sha256 = "sha256-s+KWGWOsluhDLG6LmsVIDVobtHzh5J4JLHoHMQ2+zRg=";
sha256 = "sha256-ae2eeHh57i6d0kDMZ68aXvLGFj+rXhwg1CC8cV3ndAQ=";
stripRoot = false;
};
@ -20,7 +20,8 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
install -Dm644 -t $out/share/fonts/opentype/ *.otf
install -Dm644 -t $out/share/fonts/opentype/ CommitMono-${version}/*.otf
install -Dm644 -t $out/share/fonts/truetype/ CommitMono-${version}/ttfautohint/*.ttf
runHook postInstall
'';

View File

@ -1,26 +1,31 @@
{ lib
, fetchzip
, stdenvNoCC
, fetchFromGitHub
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "hubot-sans";
version = "1.0";
version = "1.0.1";
src = fetchFromGitHub {
rev = "v" + version;
owner = "github";
repo = pname;
sha256 = "GOql+V5TH4b3TmhlgnKcx3jzUAO2jm4HRJRNzdIKxgg=";
src = fetchzip {
url = "https://github.com/github/hubot-sans/releases/download/v${finalAttrs.version}/Hubot-Sans.zip";
hash = "sha256-EWTyoGNqyZcqlF1H1Tdcodc8muHIo8C9gbSPAjiogRk=";
stripRoot = false;
};
installPhase = ''
install -m644 --target $out/share/fonts/truetype/hubot-sans -D $src/dist/hubot-sans.ttf
runHook preInstall
install -Dm644 Hubot\ Sans/TTF/*.ttf -t $out/share/fonts/truetype/
install -Dm644 Hubot\ Sans/OTF/*.otf -t $out/share/fonts/opentype/
runHook postInstall
'';
meta = {
description = "A variable font from GitHub";
homepage = "https://github.com/github/hubot-sans";
changelog = "https://github.com/github/hubot-sans/releases/tag/v${finalAttrs.version}";
license = lib.licenses.ofl;
longDescription = ''
Hubot Sans is Mona Sanss robotic sidekick. The typeface is designed with
@ -34,4 +39,4 @@ stdenvNoCC.mkDerivation rec {
maintainers = with lib.maintainers; [ drupol ];
platforms = lib.platforms.all;
};
}
})

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "sudo-font";
version = "0.69";
version = "0.74";
src = fetchzip {
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
hash = "sha256-GXlQh9JRAzbwWKTJw/y003ywjaWtiQayHxiWPTPvIO0=";
hash = "sha256-WPoqWhCKk2gZ/cdIjvmiNZ95xZ9sqnGzZuw4OEHxtrI=";
};
installPhase = ''

View File

@ -24,8 +24,8 @@ let
};
"2.13" = {
version = "2.13.11";
sha256 = "YYLdgdICPM5SczPteFsaojqY6H3IVauji6SJLcaq8eM=";
version = "2.13.12";
sha256 = "r+fm+1njyIRX6Z9wGHMOUvuifI0V49cVT3KWggbKhxk=";
pname = "scala_2_13";
};
};
@ -114,6 +114,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.all;
branch = versions.majorMinor version;
maintainers = [ maintainers.nequissimus ];
maintainers = with maintainers; [ nequissimus kashw2 ];
};
}

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
stdenv.mkDerivation rec {
version = "3.3.0";
version = "3.3.1";
pname = "scala-bare";
src = fetchurl {
url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
hash = "sha256-Bk7lCKjjucaYQxAsg2qomJQUgCK/N688JqlGTfoQFHU=";
hash = "sha256-EcDqD3HEOvD7GzVd3kFL/vAaYMFyk2deI6RNAlJpzRU=";
};
propagatedBuildInputs = [ jre ncurses.dev ] ;
@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
homepage = "http://dotty.epfl.ch/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [maintainers.karolchmist maintainers.virusdave];
maintainers = with maintainers; [ karolchmist virusdave kashw2 ];
};
}

View File

@ -45,7 +45,7 @@ let
};
pname = "solc";
version = "0.8.19";
version = "0.8.21";
meta = with lib; {
description = "Compiler for Ethereum smart contract language Solidity";
homepage = "https://github.com/ethereum/solidity";
@ -59,13 +59,9 @@ let
# upstream suggests avoid using archive generated by github
src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "sha256-xh/QPYNEWxPtDaVmBeIE/Ch98g0ox9gJ/lR6ziOu+bg=";
sha256 = "sha256-6EeRmxAmb1nCQ2FTNtWfQ7HCH0g9nJXC3jnhV0KEOwk=";
};
patches = [
./tests.patch
];
postPatch = ''
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppUrl}" ${jsoncpp}
@ -120,7 +116,7 @@ let
src = pkgs.fetchurl {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";
sha256 = "sha256-OMhSOrZ+Cz4hxIGJ1r+5mtaHm5zgLg2ALsi+WYuyYi0=";
sha256 = "sha256-GdBldJ+wjL/097RShKxVhTBjhl9q6GIeTe+l2Ti5pQI=";
};
dontUnpack = true;

View File

@ -1,14 +0,0 @@
diff --git a/test/lsp.py b/test/lsp.py
index 669951ca4..11007ae82 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -28,7 +28,8 @@ else:
import tty
# Turn off user input buffering so we get the input immediately,
# not only after a line break
- tty.setcbreak(sys.stdin.fileno())
+ if os.isatty(sys.stdin.fileno()):
+ tty.setcbreak(sys.stdin.fileno())
# Type for the pure test name without .sol suffix or sub directory

View File

@ -5,7 +5,20 @@
, version ? null
}:
let compcert = mkCoqDerivation rec {
let
# https://compcert.org/man/manual002.html
targets = {
x86_64-linux = "x86_64-linux";
aarch64-linux = "aarch64-linux";
x86_64-darwin = "x86_64-macos";
aarch64-darwin = "aarch64-macos";
};
target = targets.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
compcert = mkCoqDerivation {
pname = "compcert";
owner = "AbsInt";
@ -49,7 +62,7 @@ let compcert = mkCoqDerivation rec {
-coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \
-toolprefix ${tools}/bin/ \
-use-external-Flocq \
${if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"}
${target}
'';
installTargets = "documentation install";
@ -80,7 +93,7 @@ let compcert = mkCoqDerivation rec {
description = "Formally verified C compiler";
homepage = "https://compcert.org";
license = licenses.inria-compcert;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = builtins.attrNames targets;
maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ];
};
}; in

View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "Java Native Access";
license = with licenses; [ lgpl21 asl20 ];
maintainers = with maintainers; [ nagy ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md";
};
}

View File

@ -76,13 +76,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gdal";
version = "3.7.1";
version = "3.7.2";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${finalAttrs.version}";
hash = "sha256-RXX21tCq0xJQli3NTertM9IweONrJfGeaFj3utMFjpM=";
hash = "sha256-/7Egbg4Cg5Gqsy+CEMVbs2NCWbdJteDNWelBsrQSUj4=";
};
nativeBuildInputs = [

View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "hwloc";
version = "2.9.2";
version = "2.9.3";
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
sha256 = "sha256-Cof99nf4sAtWfSKbYyC/ayXGk+2qQ+C4UmjZmdawYM8=";
sha256 = "sha256-XEBizlVvbTRR/Bd/+4ZzohIPgd9oNd6mohqQ+9//Dew=";
};
configureFlags = [

View File

@ -66,16 +66,16 @@ let
projectArch = "x86_64";
};
};
platforms."aarch64-linux".sha256 = "1d3ign2bhv1821k0jgmakzgqlpwy358iggrgxnbxswa42ckk9m6d";
platforms."x86_64-linux".sha256 = "188hd7b11963f23y9rb0n747ssffdc80cdr1hpgwn55cmwhd8gbj";
platforms."aarch64-linux".sha256 = "0q7bd44zj8m493pqviw3xhnygls5p7dvwafgvsflkwn1jzxjbjgg";
platforms."x86_64-linux".sha256 = "1gc7rc8x7lrz05dqgzd3yzhvqh4j63495d7b23cwhpyzq2viwgyg";
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
in
stdenv.mkDerivation rec {
pname = "cef-binary";
version = "116.0.21";
gitRevision = "9c7dc32";
chromiumVersion = "116.0.5845.181";
version = "116.0.24";
gitRevision = "5332865";
chromiumVersion = "116.0.5845.190";
src = fetchurl {
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";

View File

@ -24,14 +24,14 @@ let
in
stdenv.mkDerivation rec {
pname = "libei";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libinput";
repo = "libei";
rev = version;
hash = "sha256-Xt4mhZMAohdQWsqfZCaP3+Tsauxv3GhlceiqgxdfNWo=";
hash = "sha256-ebZZ2dGXrPBUDPsuu5GZY5kDv9qndnxepQUGFDe9PUg=";
};
buildInputs = [

View File

@ -3,9 +3,17 @@
, fetchFromGitHub
, pkg-config
, gtk3
, bzip2
, curl
, fribidi
, gtk3
, iconv
, libcpuid
, libjpeg
, libpng
, libwebp
, libxml2
, zlib
}:
stdenv.mkDerivation rec {
@ -25,12 +33,21 @@ stdenv.mkDerivation rec {
makeFlags = [
"prefix=$(out)"
"config=systemlibbz2,systemlibcpuid,systemlibcurl,systemlibfribidi,systemlibiconv,systemlibjpeg,systemlibpng,systemlibwebp,systemlibxml2,systemzlib"
];
buildInputs = [
gtk3
bzip2
curl
fribidi
gtk3
iconv
libcpuid
libjpeg
libpng
libwebp
libxml2
zlib
];
meta = with lib; {

View File

@ -1,20 +1,22 @@
{ stdenv, lib, fetchFromGitHub, cmake, openmp }:
{ stdenv, lib, fetchFromGitHub, cmake, gtest, openmp }:
stdenv.mkDerivation rec {
pname = "spglib";
version = "2.0.2"; # N.B: if you change this, please update: pythonPackages.spglib
version = "2.1.0"; # N.B: if you change this, please update: pythonPackages.spglib
src = fetchFromGitHub {
owner = "spglib";
repo = "spglib";
rev = "v${version}";
sha256 = "sha256-8Voepj35CMbboL3Dc55Gc4+OLPTTSgqVQuvNcRQsqmU=";
hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake gtest ];
buildInputs = lib.optionals stdenv.isDarwin [ openmp ];
doCheck = true;
meta = with lib; {
description = "C library for finding and handling crystal symmetries";
homepage = "https://spglib.github.io/spglib/";

View File

@ -1,34 +1,25 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, camlp-streams
, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
{ stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams
, doCheck ? lib.versionAtLeast ocaml.version "4.08"
}:
if lib.versionOlder ocaml.version "4.02"
then throw "batteries is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-batteries";
version = "3.6.0";
buildDunePackage rec {
pname = "batteries";
version = "3.7.1";
src = fetchFromGitHub {
owner = "ocaml-batteries-team";
repo = "batteries-included";
rev = "v${version}";
hash = "sha256-D/0h0/70V8jmzHIUR6i2sT2Jz9/+tfR2dQgp4Bxtimc=";
hash = "sha256-0ZCaJA9xowO9QxCWcyJ1zhqG7+GNkMYJt62+VPOFj4Y=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
nativeCheckInputs = [ qtest ];
checkInputs = [ qcheck ];
propagatedBuildInputs = [ camlp-streams num ];
strictDeps = true;
inherit doCheck;
checkTarget = "test";
createFindlibDestdir = true;
meta = {
homepage = "https://ocaml-batteries-team.github.io/batteries-included/hdoc2/";
description = "OCaml Batteries Included";
@ -38,7 +29,6 @@ stdenv.mkDerivation rec {
language.
'';
license = lib.licenses.lgpl21Plus;
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
];

View File

@ -2,23 +2,21 @@
buildDunePackage rec {
pname = "ocamlgraph";
version = "2.0.0";
version = "2.1.0";
src = fetchurl {
url = "https://github.com/backtracking/ocamlgraph/releases/download/${version}/ocamlgraph-${version}.tbz";
sha256 = "029692bvdz3hxpva9a2jg5w5381fkcw55ysdi8424lyyjxvjdzi0";
hash = "sha256-D5YsNvklPfI5OVWvQbB0tqQmsvkqne95WyAFtX0wLWU=";
};
minimalOCamlVersion = "4.03";
useDune2 = true;
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
stdlib-shims
];
meta = with lib; {
homepage = "http://ocamlgraph.lri.fr/";
downloadPage = "https://github.com/backtracking/ocamlgraph";
homepage = "https://github.com/backtracking/ocamlgraph";
description = "Graph library for OCaml";
license = licenses.gpl2Oss;
maintainers = with maintainers; [ ];

View File

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "ocamlgraph_gtk";
inherit (ocamlgraph) version src useDune2 meta;
inherit (ocamlgraph) version src meta;
propagatedBuildInputs = [
lablgtk

View File

@ -10,7 +10,6 @@
buildDunePackage rec {
pname = "telegraml";
version = "unstable-2021-06-17";
duneVersion = "3";
src = fetchFromGitHub {
owner = "nv-vn";
@ -19,6 +18,10 @@ buildDunePackage rec {
sha256 = "sha256-2bMHARatwl8Zl/fWppvwbH6Ut+igJVKzwyQb8Q4gem4=";
};
postPatch = ''
substituteInPlace src/dune --replace batteries batteries.unthreaded
'';
propagatedBuildInputs = [
batteries
cohttp-lwt-unix

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.52.0";
version = "3.52.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-RydAyIzWRVQ+/xCVPtZ4HQ7eCH8cxeHW1XjEupWlAqc=";
hash = "sha256-iAz+cGFUZWJIHNEzQyGjJkwVj9GOK8onHTO8t3bs13g=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "devito";
version = "4.8.1";
version = "4.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "devitocodes";
repo = "devito";
rev = "refs/tags/v${version}";
hash = "sha256-LzqY//205XEOd3/f8k1g4OYndRHMTVplBogGJf5Forw=";
hash = "sha256-zckFU9Q5Rpj0TPeT96lXfR/yp2SYrV4sjAjqN/y8GDw=";
};
pythonRemoveDeps = [

View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, django
, fetchFromGitHub
, flit-core
, psycopg2
, pydantic
, pytest-asyncio
, pytest-django
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "django-ninja";
version = "0.22.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "vitalik";
repo = "django-ninja";
rev = "v${version}";
hash = "sha256-oeisurp9seSn3X/5jFF9DMm9nU6uDYIU1b6/J3o2be0=";
};
propagatedBuildInputs = [ django pydantic ];
nativeBuildInputs = [ flit-core ];
nativeCheckInputs = [
psycopg2
pytest-asyncio
pytest-django
pytestCheckHook
];
meta = with lib; {
changelog = "https://github.com/vitalik/django-ninja/releases/tag/v${version}";
description = "Web framework for building APIs with Django and Python type hints";
homepage = "https://django-ninja.rest-framework.com/";
license = licenses.mit;
maintainers = with maintainers; [ elohmeier ];
};
}

View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "easyocr";
version = "1.7.0";
version = "1.7.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "JaidedAI";
repo = "EasyOCR";
rev = "refs/tags/v${version}";
hash = "sha256-01Exz55eTIO/xzdq/dzV+ELkU75hpxe/EbjIqLBA8h0=";
hash = "sha256-EiiJ2LJ3uYIvgPd2y25MraV5kTa47JalDR7SLbkM9UI=";
};
postPatch = ''

View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
version = "0.14.0";
format = "setuptools";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "geopandas";

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2023.9.2";
version = "2023.9.3";
format = "pyproject";
disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-h8zSj1jmqaQtJl3lPYGj7kEBucK7DAOkdUcDo7Opy7w=";
hash = "sha256-j8uM/vEfZO1C4jsYU68nTt/cmhRKsW2MTFG84g53vE4=";
};
nativeBuildInputs = [

View File

@ -27,7 +27,7 @@ let
in
buildPythonPackage rec {
pname = "jax";
version = "0.4.14";
version = "0.4.16";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -37,13 +37,17 @@ buildPythonPackage rec {
repo = pname;
# google/jax contains tags for jax and jaxlib. Only use jax tags!
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg=";
hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg=";
};
nativeBuildInputs = [
setuptools
];
# The version is automatically set to ".dev" if this variable is not set.
# https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3
JAX_RELEASE = "1";
# jaxlib is _not_ included in propagatedBuildInputs because there are
# different versions of jaxlib depending on the desired target hardware. The
# JAX project ships separate wheels for CPU, GPU, and TPU.

View File

@ -39,7 +39,7 @@ in
assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux;
let
version = "0.4.14";
version = "0.4.16";
inherit (python) pythonVersion;
@ -60,15 +60,15 @@ let
{
"x86_64-linux" = getSrcFromPypi {
platform = "manylinux2014_x86_64";
hash = "sha256-nyylSZfqHeftlvVgJZFCN1ldjluZVJIYu4ZSsVxvXf8=";
hash = "sha256-4XyaDnKEMhAbfPEvN3RCDEjXTWbOL6tWrTlyYeiboVs=";
};
"aarch64-darwin" = getSrcFromPypi {
platform = "macosx_11_0_arm64";
hash = "sha256-La3wYbGCjWTl7krBD6BaBRqyBD8R530Lckbz0AWv0FM=";
hash = "sha256-IG2pCui/Yj+LDMbQwBVlu7yl2llqnaxMzz/MtBvBr6U=";
};
"x86_64-darwin" = getSrcFromPypi {
platform = "macosx_10_14_x86_64";
hash = "sha256-hDg5+qisgtgOrdvbjxsUgI73cW6Aah8NLjhPe4kMAsM=";
hash = "sha256-x5DqsmHqEb7Dl7dnxT5N0l30GKt5OPZpq3HGX9MFKmo=";
};
};
@ -78,7 +78,7 @@ let
# https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index.
gpuSrc = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl";
hash = "sha256-CcQ5kjp4XfUX4/RwFY3T5G3kVKAeyoCTXu1Lo4O16Qo=";
hash = "sha256-eLOprP2kv6roodwRKZXVZFQCD1wC26TSTEDJBjMu/Uo=";
};
in

View File

@ -54,7 +54,7 @@ let
inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl;
pname = "jaxlib";
version = "0.4.14";
version = "0.4.16";
meta = with lib; {
description = "JAX is Autograd and XLA, brought together for high-performance machine learning research.";
@ -151,7 +151,7 @@ let
repo = "jax";
# google/jax contains tags for jax and jaxlib. Only use jaxlib tags!
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg=";
hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg=";
};
nativeBuildInputs = [
@ -203,6 +203,10 @@ let
GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc";
# The version is automatically set to ".dev" if this variable is not set.
# https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3
JAXLIB_RELEASE = "1";
preConfigure = ''
# dummy ldconfig
mkdir dummy-ldconfig
@ -260,10 +264,10 @@ let
];
sha256 = (if cudaSupport then {
x86_64-linux = "sha256-L+d4umcN8eZQJS7NtbyMhFbbGUVd0a73GOYbZx3bW9Q=";
x86_64-linux = "sha256-6HkrEWAPjGPj4zRxahl0FLiV7WZO/6zsdCX8STfV5EE=";
} else {
x86_64-linux = "sha256-V1giQbu70RYjbNsqudibiCgvtFNRIJ8XG75QtIzjM4g=";
aarch64-linux = "sha256-DRU4aT7kQffhsOllgHtSlIsYOeLF4Sy5o5RR1CaTle0=";
x86_64-linux = "sha256-MDnuJwJ/xKnC72Qub0ETYj5uQB2r8/AgGm10oqmzzcc=";
aarch64-linux = "sha256-aVUm612VNEsjZLDrtiOPTqSk1t+AhmOx+pOG3bZdOAw=";
}).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}");
};

View File

@ -0,0 +1,66 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
, dbus
, pkgsLibpcap
, pkg-about
, setuptools
, tox
}:
buildPythonPackage rec {
pname = "libpcap";
version = "1.11.0b7";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-gEWFqmeOJTVHdjcSOxfVLZtrNSO3CTY1L2VcXOu7q7k=";
};
nativeBuildInputs = [
setuptools
tox
];
postPatch = ''
cat <<EOF >src/libpcap/libpcap.cfg
[libpcap]
LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary}
EOF
'';
propagatedBuildInputs = [
dbus.lib
pkgsLibpcap
pkg-about
];
# Project has tests, but I can't get them to run even outside of nix
doCheck = false;
pythonImportsCheck = [
"libpcap"
];
meta = with lib; {
description = "Python binding for the libpcap C library";
longDescription = ''
Python libpcap module is a low-level binding for libpcap C library.
It is an effort to allow python programs full access to the API provided by the well known libpcap Unix C library and by its implementations provided under Win32 systems by such packet capture systems as: Npcap, WinPcap
libpcap is a lightweight Python package, based on the ctypes library.
It is fully compliant implementation of the original C libpcap from 1.0.0 up to 1.9.0 API and the WinPcaps 4.1.3 libpcap (1.0.0rel0b) API by implementing whole its functionality in a clean Python instead of C.
'';
homepage = "https://github.com/karpierz/libpcap/";
license = licenses.bsd3;
maintainers = [ teams.ororatech ];
};
}

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "metakernel";
version = "0.30.0";
version = "0.30.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-O5BAfb+6fCbETaJmWsVSayTId/57VjA7U3FGCeNe28Y=";
hash = "sha256-TKBvuGh8DnPDLaOpwOvLZHdj1kBOTE/JLda1nQ6J//U=";
};
nativeBuildInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "nocaselist";
version = "1.1.1";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-UnKyMuCCRmlqsm/g670ouJidrJ7lcytQJklQMjtRPSM=";
hash = "sha256-RWqgAMZ3fF0hsCnFLlMvlDKNT7TxWtKk3T3WLbMLOJI=";
};
propagatedBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "ossfs";
version = "2023.5.0";
version = "2023.8.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fsspec";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-h9h5h2eJO1wzOR7oC2usrEx0ADSoKDu74YczAmZL9NU=";
hash = "sha256-v6QZgv1QwBrQpCwP/1z6704UNvQyoCrpQGkhTmncbjQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -7,9 +7,9 @@
buildPythonPackage rec {
pname = "pytube";
version = "12.1.2";
version = "15.0.0";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
format = "setuptools";
@ -17,13 +17,17 @@ buildPythonPackage rec {
owner = "pytube";
repo = "pytube";
rev = "v${version}";
hash = "sha256-Y4mriCwFvwAZ3e8kHKo9/S2vReb4q+b8KTHxtQo8SEw=";
hash = "sha256-Nvs/YlOjk/P5nd1kpUnCM2n6yiEaqZP830UQI0Ug1rk=";
};
nativeCheckInputs = [
pytestCheckHook
];
disabledTests = [
"test_streaming"
];
disabledTestPaths = [
"tests/test_extract.py"
"tests/test_query.py"

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "qdrant-client";
version = "1.5.0";
version = "1.5.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "qdrant";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-k+ggx4QyVduqtV4WwHELyQDAHdaGE0bizpG1ie6x7FM=";
hash = "sha256-9aZBUrGCNRQjYRF1QmIwVqeT5Tdgv7CCkyOUsbZbmVM=";
};
nativeBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "requests-pkcs12";
version = "1.18";
version = "1.21";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "m-click";
repo = "requests_pkcs12";
rev = version;
hash = "sha256-jZWaTcPM4EO8e+eVpYU8fQ4H53OzlaMUsT/d2DWuU+0=";
hash = "sha256-0avykVnMzClFqjDdC4BW9jnZzupinG5JUwq8TuCWkgo=";
};
propagatedBuildInputs = [

View File

@ -31,15 +31,15 @@
buildPythonPackage rec {
pname = "scrapy";
version = "2.10.1";
version = "2.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit version;
pname = "Scrapy";
hash = "sha256-kdZ4dfu1N2B7B+MTY0RXGKNTK1RObitLr4oEKyGh0Q8=";
hash = "sha256-PL3tzgw/DgSC1hvi10WGg758188UsO5q37rduA9bNqU=";
};
nativeBuildInputs = [

View File

@ -2,28 +2,46 @@
, stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, flaky
, pythonOlder
, numpy
, pandas
, torch
, scikit-learn
, scipy
, tabulate
, torch
, tqdm
, flaky
, pandas
, pytestCheckHook
, safetensors
, pythonAtLeast
}:
buildPythonPackage rec {
pname = "skorch";
version = "0.14.0";
version = "0.15.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-/d0s0N40W18uGfVbD9VEbhbWfduoo+TBqDjmTkjMUxs=";
hash = "sha256-39XVBlCmbg162z9uL84GZrU+v+M8waXbGdVV72ZYf84=";
};
propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ];
nativeCheckInputs = [ flaky pandas pytestCheckHook ];
disabled = pythonOlder "3.8";
propagatedBuildInputs = [
numpy
scikit-learn
scipy
tabulate
torch
tqdm
];
nativeCheckInputs = [
flaky
pandas
pytestCheckHook
safetensors
];
# patch out pytest-cov dep/invocation
postPatch = ''
@ -41,6 +59,10 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isDarwin [
# there is a problem with the compiler selection
"test_fit_and_predict_with_compile"
] ++ lib.optionals (pythonAtLeast "3.11") [
# Python 3.11+ not yet supported for torch.compile
# https://github.com/pytorch/pytorch/blob/v2.0.1/torch/_dynamo/eval_frame.py#L376-L377
"test_fit_and_predict_with_compile"
];
disabledTestPaths = [

View File

@ -10,9 +10,9 @@
buildPythonPackage rec {
pname = "svg2tikz";
version = "1.2.0";
version = "2.1.0";
disabled = pythonOlder "3.10";
disabled = pythonOlder "3.7";
format = "pyproject";
@ -20,14 +20,9 @@ buildPythonPackage rec {
owner = "xyz2tex";
repo = "svg2tikz";
rev = "refs/tags/v${version}";
hash = "sha256-oFcKRcXef1Uz0qFi6Gga/D4u8zW0RjXAnHDlhRr33Ts=";
hash = "sha256-v8+0h90uJlkI5eJcwCG55nxPz8n2aJXwP8Ocp48cl9M=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "+dairiki.1" ""
'';
nativeBuildInputs = [
poetry-core
];
@ -44,7 +39,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "svg2tikz" ];
meta = with lib; {
changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/README.md#changes-bug-fixes-and-known-problems-from-the-original";
changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/CHANGELOG.md";
homepage = "https://github.com/xyz2tex/svg2tikz";
description = "Set of tools for converting SVG graphics to TikZ/PGF code";
license = licenses.gpl2Plus;

View File

@ -10,7 +10,7 @@
buildGoModule rec {
pname = "actionlint";
version = "1.6.25";
version = "1.6.26";
subPackages = [ "cmd/actionlint" ];
@ -18,10 +18,10 @@ buildGoModule rec {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
hash = "sha256-MbMisADJg0c0idAZ3Ru1WJMzbYoyac71CIeQd3Xjsy0=";
hash = "sha256-BCja8twbPwYI41JuQs2LHMCXlTbY5FAjHhZvn5mIlkg=";
};
vendorHash = "sha256-YkLZYL+VgO2QfkjVG3baPCn+CExRnsnxtdmL3GGNGlI=";
vendorHash = "sha256-sBwI2L9tNg8Q/vIhhp0eIxetklytvJj+O1mWjrHkH24=";
nativeBuildInputs = [ makeWrapper ronn installShellFiles ];

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "argc";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "sigoden";
repo = pname;
rev = "v${version}";
hash = "sha256-BM9MXokVXA5EJwr8F7Wg5LTE1xhmj9ttVXOMNJx0RRw=";
hash = "sha256-DmBSHiil9TdPog1Tnz2UjwbgLwwJwdYg9qAykolriQs=";
};
cargoHash = "sha256-SScCPBERXScYJ9LlPcbIhwCikRum0F1tU3gZYaQRFTo=";
cargoHash = "sha256-JyiBEawBTm8t9oKFH5OCKabWasuiRoBe0rSeyHKuXGU=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "biome";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "cli/v${version}";
hash = "sha256-/rIPIZX3w28xTn+UyAsB+lgfF0LDmxM92EofcPSCD+4=";
hash = "sha256-WiyORFXS1kpOaMCbnPdr5ewa6D4ozFTIRSArVlA2FvY=";
};
cargoHash = "sha256-5mX4RDACImjiU+nSuN9SzyibIMcUWYCAJfikX2gWIfg=";
cargoHash = "sha256-s2CVEGYRzJgsg4soETStpaJ7GDNdJCBJ+Qbn88sFlDQ=";
nativeBuildInputs = [
pkg-config

View File

@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "code-maat";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://github.com/adamtornhill/code-maat/releases/download/v${finalAttrs.version}/code-maat-${finalAttrs.version}-standalone.jar";
hash = "sha256-cAaGX9BX27Z2GN583YmhagWsBIygVc0ZDkzbspM9OJw=";
hash = "sha256-QoeuIDSQGERFD3aVR7xEl6DaGm0cf6b63IWHBeZ0O18=";
};
dontUnpack = true;

View File

@ -49,8 +49,10 @@ buildGoModule rec {
fixup_yarn_lock yarn.lock
# node-gyp tries to download always the headers and fails: https://github.com/NixOS/nixpkgs/issues/195404
yarn remove --offline jest-canvas-mock canvas
# playwright tries to download Chrome and fails
yarn remove --offline jest-canvas-mock canvas @playwright/test playwright
export PATH=$PATH:$(pwd)/node_modules/.bin
NODE_ENV=production node node_modules/.bin/vite build
popd
@ -84,7 +86,5 @@ buildGoModule rec {
homepage = "https://coder.com";
license = lib.licenses.agpl3;
maintainers = [ lib.maintainers.ghuntley lib.maintainers.urandom ];
# Failed to download Chromium 109.0.5414.46
broken = true; # At 2023-03-30
};
}

File diff suppressed because it is too large Load Diff

View File

@ -1,36 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "typst-lsp";
version = "0.9.5";
version = "0.10.0";
src = fetchFromGitHub {
owner = "nvarner";
repo = "typst-lsp";
rev = "v${version}";
hash = "sha256-rV7vzI4PPyBJX/ofVCXnXd8eH6+UkGaAL7PwhP71t0k=";
hash = "sha256-rsG7YZjy4UgFGsehlslsrOAD5YMpVVBI2MERlxgniVA=";
};
patches = [
# git information isn't available with fetchFromGitHub
# https://github.com/nvarner/typst-lsp/pull/303
(fetchpatch {
name = "fix-build-when-git-information-is-not-available.patch";
url = "https://github.com/nvarner/typst-lsp/commit/420de6235eb1aa492337a8cc43b04134a3ffab00.patch";
hash = "sha256-Rs9pzSUg4YNGzYnX8tbOmCwbPyZ9P18Eyg451fa2Iqg=";
})
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.0" = "sha256-DOh7WQowJXTxI9GDXfy73hvr3J+VcDqSDaClLlUpMsM=";
"typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA=";
"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.4" = "sha256-d0vlZqg0RcRvZM7xYdMLX2/UeolUbqZ9H4drJRRKBmc=";
};
};
patches = [
# update typstfmt to symlink its README.md into the library crate
# without this patch, typst-lsp fails to build when dependencies are vendored
# https://github.com/astrale-sharp/typstfmt/pull/81
./update-typstfmt.patch
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];

View File

@ -1,22 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3390,7 +3390,7 @@ dependencies = [
[[package]]
name = "typstfmt_lib"
version = "0.2.0"
-source = "git+https://github.com/astrale-sharp/typstfmt?rev=cf0ac91#cf0ac9189a4a2d47f4bc833f2538dca032534455"
+source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880"
dependencies = [
"globmatch",
"itertools 0.10.5",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
"fmt",
] }
walkdir = "2.3"
-typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "cf0ac91" }
+typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" }
# jaeger
opentelemetry = { version = "0.20.0", optional = true }

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lightningcss";
version = "1.21.8";
version = "1.22.0";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
rev = "refs/tags/v${version}";
sha256 = "Y1eSi8/YX0iI43Zp6dCBYCZAzRnVO5nSXBykWrp9MjM=";
sha256 = "K7whGWIukMrCqGaunHVuvr9k1EOTPSMb0x/A2JysVI0=";
};
cargoHash = "sha256-OUfC0HPNsY0lBv2nM56uzFqfV3SZfOAR//VXDu6BJ+M=";
cargoHash = "sha256-itwU6JIxDbem93KIpjWyKBiZhQP62D9h8ohIcMD14+0=";
buildFeatures = [
"cli"
@ -36,6 +36,7 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/parcel-bundler/lightningcss/releases/tag/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ toastal ];
mainProgram = "lightningcss";
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
};

View File

@ -8,7 +8,7 @@ let
, flex
, getopt
, git
, gnat11
, gnat
, gcc
, lib
, perl
@ -35,7 +35,7 @@ let
};
nativeBuildInputs = [ bison curl git perl ];
buildInputs = [ flex zlib (if withAda then gnat11 else gcc) ];
buildInputs = [ flex zlib (if withAda then gnat else gcc) ];
enableParallelBuilding = true;
dontConfigure = true;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "qc";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "qownnotes";
repo = "qc";
rev = "v${version}";
hash = "sha256-lNS2wrjG70gi6mpIYMvuusuAJL3LkAVh8za+KnBTioc=";
hash = "sha256-SrvcRF2yRGGPTk835ykG+NH9WPoc/bXO5tSj43Q7T3g=";
};
vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o=";
@ -17,6 +17,7 @@ buildGoModule rec {
"-s" "-w" "-X=github.com/qownnotes/qc/cmd.version=${version}"
];
# There are no automated tests
doCheck = false;
subPackages = [ "." ];

View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
version = "0.24.3";
version = "0.25.0";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
sha256 = "sha256-CCTG58dwO9gYe0WSUXFeaBSgvZ7pbX9S3B3hzabzkjo=";
sha256 = "sha256-Lt8ubK96ntcQJEnQ37nF8N4gJ8nmphwkbM6KJor13lo=";
};
cargoHash = "sha256-p2qAWAZ1Y0GI0t9wHmn5Ww3o5vXpA6rsA/D7HD2x6o0=";
cargoHash = "sha256-cYhzEVHpi7qMCU9fe3wxOQGX6YssJIeo4onLUBtqN6A=";
preCheck = ''
export HOME=$(mktemp -d)

View File

@ -1141,7 +1141,7 @@ dependencies = [
[[package]]
name = "cargo-shuttle"
version = "0.25.1"
version = "0.26.0"
dependencies = [
"anyhow",
"assert_cmd",
@ -5352,7 +5352,7 @@ dependencies = [
[[package]]
name = "shuttle-admin"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"clap",
@ -5369,7 +5369,7 @@ dependencies = [
[[package]]
name = "shuttle-auth"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"async-trait",
@ -5398,7 +5398,7 @@ dependencies = [
[[package]]
name = "shuttle-codegen"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"pretty_assertions",
"proc-macro-error",
@ -5415,7 +5415,7 @@ dependencies = [
[[package]]
name = "shuttle-common"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"async-trait",
@ -5438,7 +5438,6 @@ dependencies = [
"opentelemetry-otlp",
"pin-project",
"proptest",
"prost-types",
"rand",
"reqwest",
"ring",
@ -5464,20 +5463,23 @@ dependencies = [
[[package]]
name = "shuttle-common-tests"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"cargo-shuttle",
"hyper",
"portpicker",
"reqwest",
"shuttle-common",
"shuttle-proto",
"tokio",
"tokio-stream",
"tonic",
"tower",
]
[[package]]
name = "shuttle-deployer"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"async-trait",
@ -5500,11 +5502,13 @@ dependencies = [
"opentelemetry-http",
"pipe",
"portpicker",
"prost-types",
"rand",
"rmp-serde",
"serde",
"serde_json",
"shuttle-common",
"shuttle-common-tests",
"shuttle-proto",
"shuttle-service",
"sqlx",
@ -5513,6 +5517,7 @@ dependencies = [
"tempfile",
"thiserror",
"tokio",
"tokio-stream",
"toml 0.5.11",
"tonic",
"tower",
@ -5528,7 +5533,7 @@ dependencies = [
[[package]]
name = "shuttle-gateway"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"async-trait",
@ -5584,9 +5589,35 @@ dependencies = [
"x509-parser",
]
[[package]]
name = "shuttle-logger"
version = "0.26.0"
dependencies = [
"async-trait",
"chrono",
"clap",
"ctor",
"once_cell",
"portpicker",
"pretty_assertions",
"prost-types",
"serde_json",
"shuttle-common",
"shuttle-common-tests",
"shuttle-proto",
"sqlx",
"thiserror",
"tokio",
"tokio-stream",
"tonic",
"tracing",
"tracing-subscriber",
"uuid",
]
[[package]]
name = "shuttle-proto"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"chrono",
@ -5604,7 +5635,7 @@ dependencies = [
[[package]]
name = "shuttle-provisioner"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"aws-config",
"aws-sdk-rds",
@ -5630,7 +5661,7 @@ dependencies = [
[[package]]
name = "shuttle-resource-recorder"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"async-trait",
"chrono",
@ -5654,12 +5685,13 @@ dependencies = [
[[package]]
name = "shuttle-runtime"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"async-trait",
"cap-std",
"chrono",
"colored",
"crossbeam-channel",
"futures",
"hyper",
@ -5678,8 +5710,8 @@ dependencies = [
"tokio-stream",
"tonic",
"tower",
"tracing",
"tracing-subscriber",
"uuid",
"wasi-common",
"wasmtime",
"wasmtime-wasi",
@ -5687,7 +5719,7 @@ dependencies = [
[[package]]
name = "shuttle-service"
version = "0.25.0"
version = "0.26.0"
dependencies = [
"anyhow",
"async-trait",

View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-shuttle";
version = "0.25.1";
version = "0.26.0";
src = fetchFromGitHub {
owner = "shuttle-hq";
repo = "shuttle";
rev = "v${version}";
hash = "sha256-UB9S3Ougd7t+D3oAYE9i6AUY76bNKrr605W6GWh1vb0=";
hash = "sha256-O6erIv+6DbxioB4F1Mfaj51zSswQErcUuFdA+A7DQRA=";
};
cargoLock = {

Some files were not shown because too many files have changed in this diff Show More