Merge master into staging-next

This commit is contained in:
github-actions[bot]
2025-01-02 00:14:15 +00:00
committed by GitHub
149 changed files with 1594 additions and 17474 deletions
+1 -1
View File
@@ -728,7 +728,7 @@ buildPythonPackage rec {
(fetchDebianPatch {
inherit pname version;
debianRevision = "5";
name = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch";
patch = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch";
hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0=";
})
];
+6
View File
@@ -18644,6 +18644,12 @@
githubId = 40905037;
name = "qwqawawow";
};
qxrein = {
email = "mnv07@proton.me";
github = "qxrein";
githubId = 101001298;
name = "qxrein";
};
qyliss = {
email = "hi@alyssa.is";
github = "alyssais";
+2 -2
View File
@@ -44,8 +44,8 @@ let
borgWrapper () {
local result
borg "$@" && result=$? || result=$?
if [[ -z "${toString cfg.failOnWarnings}" ]] && [[ "$result" == 1 ]]; then
echo "ignoring warning return value 1"
if [[ -z "${toString cfg.failOnWarnings}" ]] && [[ "$result" == 1 || ("$result" -ge 100 && "$result" -le 127) ]]; then
echo "ignoring warning return value $result"
return 0
else
return "$result"
+1 -1
View File
@@ -130,7 +130,7 @@ in
type = addCheck str (
x:
cfg.svcManager == "command"
|| elem x [
|| lib.elem x [
"restart"
"reload"
"nop"
+1 -1
View File
@@ -193,7 +193,7 @@ in
ExecStart =
with cfg;
let
opt = n: v: optionalString (v != null) ''-${n}="${v}"'';
opt = n: v: lib.optionalString (v != null) ''-${n}="${v}"'';
in
lib.concatStringsSep " \\\n" [
"${pkgs.cfssl}/bin/cfssl serve"
@@ -94,14 +94,14 @@ in
Restart = "always";
ExecStart =
with cfg;
concatStringsSep " " (
lib.concatStringsSep " " (
[
(lib.getExe cfg.package)
"-logtostderr"
"-host=${listenAddress}"
"-port=${toString port}"
]
++ optionals prometheus.enable [
++ lib.optionals prometheus.enable [
"-enable_prometheus"
"-prometheus_host=${prometheus.listenAddress}"
"-prometheus_port=${toString prometheus.port}"
@@ -149,7 +149,7 @@ in
};
};
networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ];
networking.firewall.allowedTCPPorts = with cfg; lib.optionals openFirewall [ port ];
};
meta.maintainers = with lib.maintainers; [ azahi ];
+2 -2
View File
@@ -60,7 +60,7 @@ in
Restart = "always";
ExecStart =
with cfg;
concatStringsSep " " (
lib.concatStringsSep " " (
[
"${pkgs.endlessh}/bin/endlessh"
"-p ${toString port}"
@@ -109,7 +109,7 @@ in
};
};
networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ];
networking.firewall.allowedTCPPorts = with cfg; lib.optionals openFirewall [ port ];
};
meta.maintainers = with lib.maintainers; [ azahi ];
+11 -5
View File
@@ -150,7 +150,7 @@ in
};
Ebpf.ModulesPath = lib.mkOption {
type = lib.types.path;
type = lib.types.nullOr lib.types.path;
default =
if cfg.settings.ProcMonitorMethod == "ebpf" then
"${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd"
@@ -202,10 +202,16 @@ in
services.opensnitchd = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = [
""
"${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" cfg.settings}"
];
ExecStart =
let
preparedSettings = removeAttrs cfg.settings (
lib.optional (cfg.settings.ProcMonitorMethod != "ebpf") "Ebpf"
);
in
[
""
"${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" preparedSettings}"
];
};
preStart = lib.mkIf (cfg.rules != { }) (
let
+35 -36
View File
@@ -5,7 +5,6 @@
pkgs,
...
}:
with builtins;
let
cfg = config.services.tor;
opt = options.services.tor;
@@ -15,7 +14,7 @@ let
See [torrc manual](https://2019.www.torproject.org/docs/tor-manual.html.en#${option}).
'';
bindsPrivilegedPort =
any
lib.any
(
p0:
let
@@ -25,7 +24,7 @@ let
false
else
let
p2 = if isInt p1 then p1 else toInt p1;
p2 = if lib.isInt p1 then p1 else lib.toInt p1;
in
p1 != null && 0 < p2 && p2 < 1024
)
@@ -127,7 +126,7 @@ let
);
config = {
flags =
filter (name: config.${name} == true) isolateFlags
lib.filter (name: config.${name} == true) isolateFlags
++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
};
}
@@ -197,7 +196,7 @@ let
config = lib.mkIf doConfig {
# Only add flags in SOCKSPort to avoid duplicates
flags =
filter (name: config.${name} == true) flags
lib.filter (name: config.${name} == true) flags
++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
};
}
@@ -245,7 +244,7 @@ let
}
);
config = {
flags = filter (name: config.${name} == true) flags;
flags = lib.filter (name: config.${name} == true) flags;
};
}
))
@@ -272,16 +271,16 @@ let
k: v:
if v == null then
""
else if isBool v then
else if lib.isBool v then
(if v then "1" else "0")
else if v ? "unix" && v.unix != null then
"unix:" + v.unix + lib.optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
"unix:" + v.unix + lib.optionalString (v ? "flags") (" " + lib.concatStringsSep " " v.flags)
else if v ? "port" && v.port != null then
lib.optionalString (v ? "addr" && v.addr != null) "${v.addr}:"
+ toString v.port
+ lib.optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
+ lib.optionalString (v ? "flags") (" " + lib.concatStringsSep " " v.flags)
else if k == "ServerTransportPlugin" then
lib.optionalString (v.transports != [ ]) "${concatStringsSep "," v.transports} exec ${v.exec}"
lib.optionalString (v.transports != [ ]) "${lib.concatStringsSep "," v.transports} exec ${v.exec}"
else if k == "HidServAuth" then
v.onion + " " + v.auth
else
@@ -298,7 +297,7 @@ let
k: v:
# Not necesssary, but prettier rendering
if
elem k [
lib.elem k [
"AutomapHostsSuffixes"
"DirPolicy"
"ExitPolicy"
@@ -306,7 +305,7 @@ let
]
&& v != [ ]
then
concatStringsSep "," v
lib.concatStringsSep "," v
else
v
) (lib.filterAttrs (k: v: !(v == null || v == "")) settings)
@@ -750,7 +749,7 @@ in
]);
apply = map (
v:
if isInt v then
if lib.isInt v then
{
port = v;
target = null;
@@ -816,7 +815,7 @@ in
settings.HiddenServiceVersion = config.version;
settings.HiddenServiceAuthorizeClient =
if config.authorizeClient != null then
config.authorizeClient.authType + " " + concatStringsSep "," config.authorizeClient.clientNames
config.authorizeClient.authType + " " + lib.concatStringsSep "," config.authorizeClient.clientNames
else
null;
settings.HiddenServicePort = map (
@@ -929,7 +928,7 @@ in
}
);
config = {
flags = filter (name: config.${name} == true) flags;
flags = lib.filter (name: config.${name} == true) flags;
};
}
))
@@ -998,7 +997,7 @@ in
}
))
]);
apply = p: if isInt p || isString p then { port = p; } else p;
apply = p: if lib.isInt p || lib.isString p then { port = p; } else p;
};
options.ExtORPortCookieAuthFile = optionPath "ExtORPortCookieAuthFile";
options.ExtORPortCookieAuthFileGroupReadable = optionBool "ExtORPortCookieAuthFileGroupReadable";
@@ -1198,17 +1197,17 @@ in
lib.mapAttrsToList (
n: o:
lib.optionals (o.settings.HiddenServiceVersion == 2) [
(optional (o.settings.HiddenServiceExportCircuitID != null) ''
(lib.optional (o.settings.HiddenServiceExportCircuitID != null) ''
HiddenServiceExportCircuitID is used in the HiddenService: ${n}
but this option is only for v3 hidden services.
'')
]
++ lib.optionals (o.settings.HiddenServiceVersion != 2) [
(optional (o.settings.HiddenServiceAuthorizeClient != null) ''
(lib.optional (o.settings.HiddenServiceAuthorizeClient != null) ''
HiddenServiceAuthorizeClient is used in the HiddenService: ${n}
but this option is only for v2 hidden services.
'')
(optional (o.settings.RendPostPeriod != null) ''
(lib.optional (o.settings.RendPostPeriod != null) ''
RendPostPeriod is used in the HiddenService: ${n}
but this option is only for v2 hidden services.
'')
@@ -1245,7 +1244,7 @@ in
}
//
lib.optionalAttrs
(elem cfg.relay.role [
(lib.elem cfg.relay.role [
"bridge"
"private-bridge"
])
@@ -1307,13 +1306,13 @@ in
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts =
concatMap
lib.concatMap
(
o:
if isInt o && o > 0 then
if lib.isInt o && o > 0 then
[ o ]
else
lib.optionals (o ? "port" && isInt o.port && o.port > 0) [ o.port ]
lib.optionals (o ? "port" && lib.isInt o.port && o.port > 0) [ o.port ]
)
(
lib.flatten [
@@ -1341,40 +1340,40 @@ in
(
"+"
+ pkgs.writeShellScript "ExecStartPre" (
concatStringsSep "\n" (
lib.concatStringsSep "\n" (
lib.flatten (
[ "set -eu" ]
++ lib.mapAttrsToList (
name: onion:
lib.optional (onion.authorizedClients != [ ]) ''
rm -rf ${escapeShellArg onion.path}/authorized_clients
install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} ${escapeShellArg onion.path}/authorized_clients
rm -rf ${lib.escapeShellArg onion.path}/authorized_clients
install -d -o tor -g tor -m 0700 ${lib.escapeShellArg onion.path} ${lib.escapeShellArg onion.path}/authorized_clients
''
++ imap0 (i: pubKey: ''
++ lib.imap0 (i: pubKey: ''
echo ${pubKey} |
install -o tor -g tor -m 0400 /dev/stdin ${escapeShellArg onion.path}/authorized_clients/${toString i}.auth
install -o tor -g tor -m 0400 /dev/stdin ${lib.escapeShellArg onion.path}/authorized_clients/${toString i}.auth
'') onion.authorizedClients
++ lib.optional (onion.secretKey != null) ''
install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path}
key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)"
install -d -o tor -g tor -m 0700 ${lib.escapeShellArg onion.path}
key="$(cut -f1 -d: ${lib.escapeShellArg onion.secretKey} | head -1)"
case "$key" in
("== ed25519v"*"-secret")
install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;;
install -o tor -g tor -m 0400 ${lib.escapeShellArg onion.secretKey} ${lib.escapeShellArg onion.path}/hs_ed25519_secret_key;;
(*) echo >&2 "NixOS does not (yet) support secret key type for onion: ${name}"; exit 1;;
esac
''
) cfg.relay.onionServices
++ lib.mapAttrsToList (
name: onion:
imap0 (
lib.imap0 (
i: prvKeyPath:
let
hostname = removeSuffix ".onion" name;
hostname = lib.removeSuffix ".onion" name;
in
''
printf "%s:" ${escapeShellArg hostname} | cat - ${escapeShellArg prvKeyPath} |
printf "%s:" ${lib.escapeShellArg hostname} | cat - ${lib.escapeShellArg prvKeyPath} |
install -o tor -g tor -m 0700 /dev/stdin \
${runDir}/ClientOnionAuthDir/${escapeShellArg hostname}.${toString i}.auth_private
${runDir}/ClientOnionAuthDir/${lib.escapeShellArg hostname}.${toString i}.auth_private
''
) onion.clientAuthorizations
) cfg.client.onionServices
@@ -1417,7 +1416,7 @@ in
BindPaths = [ stateDir ];
BindReadOnlyPaths =
[
storeDir
builtins.storeDir
"/etc"
]
++ lib.optionals config.services.resolved.enable [
+3 -3
View File
@@ -17,9 +17,9 @@ let
util-linux
busybox
]
++ optional cfg.btrfs.enable btrfs-progs
++ optional cfg.ext4.enable e2fsprogs
++ optional cfg.xfs.enable xfsprogs
++ lib.optional cfg.btrfs.enable btrfs-progs
++ lib.optional cfg.ext4.enable e2fsprogs
++ lib.optional cfg.xfs.enable xfsprogs
++ cfg.extraPackages;
hasFs = fsName: lib.any (fs: fs.fsType == fsName) (lib.attrValues config.fileSystems);
settingsFormat = pkgs.formats.yaml { };
+3 -3
View File
@@ -15,7 +15,7 @@ let
credentialsFile
else
pkgs.writeText "magnetico-credentials" (
concatStrings (mapAttrsToList (user: hash: "${user}:${hash}\n") cfg.web.credentials)
lib.concatStrings (lib.mapAttrsToList (user: hash: "${user}:${hash}\n") cfg.web.credentials)
);
# default options in magneticod/main.go
@@ -28,7 +28,7 @@ let
crawlerArgs =
with cfg.crawler;
escapeShellArgs (
lib.escapeShellArgs (
[
"--database=${dbURI}"
"--indexer-addr=${address}:${toString port}"
@@ -40,7 +40,7 @@ let
webArgs =
with cfg.web;
escapeShellArgs (
lib.escapeShellArgs (
[
"--database=${dbURI}"
(
+1
View File
@@ -1314,6 +1314,7 @@ in
{
device = "tmpfs";
fsType = "tmpfs";
options = [ "mode=755" ];
}
else
{
+2 -2
View File
@@ -4,11 +4,11 @@
pkgs ? import ../../.. { inherit system config; },
lib ? pkgs.lib,
kernelVersionsToTest ? [
"4.19"
"5.4"
"5.10"
"5.15"
"6.1"
"6.6"
"latest"
],
}:
@@ -33,7 +33,7 @@ let
# systemd in stage 1
raid-sd-stage-1 = {
test = callTest ./systemd-stage-1.nix;
kernelFilter = lib.id;
kernelFilter = lib.filter (v: v != "5.15");
flavour = "raid";
};
thinpool-sd-stage-1 = {
+62 -45
View File
@@ -1,5 +1,13 @@
import ./make-test-python.nix (
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
monitorMethods = [
"ebpf"
"proc"
"ftrace"
"audit"
];
in
{
name = "opensnitch";
@@ -7,10 +15,9 @@ import ./make-test-python.nix (
maintainers = [ onny ];
};
nodes = {
server =
{ ... }:
{
nodes =
{
server = {
networking.firewall.allowedTCPPorts = [ 80 ];
services.caddy = {
enable = true;
@@ -19,50 +26,60 @@ import ./make-test-python.nix (
'';
};
};
clientBlocked =
{ ... }:
{
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
};
};
clientAllowed =
{ ... }:
{
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
rules = {
curl = {
name = "curl";
enabled = true;
action = "allow";
duration = "always";
operator = {
type = "simple";
sensitive = false;
operand = "process.path";
data = "${pkgs.curl}/bin/curl";
}
// (lib.listToAttrs (
map (
m:
lib.nameValuePair "client_blocked_${m}" {
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
settings.ProcMonitorMethod = m;
};
}
) monitorMethods
))
// (lib.listToAttrs (
map (
m:
lib.nameValuePair "client_allowed_${m}" {
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
settings.ProcMonitorMethod = m;
rules = {
curl = {
name = "curl";
enabled = true;
action = "allow";
duration = "always";
operator = {
type = "simple";
sensitive = false;
operand = "process.path";
data = "${pkgs.curl}/bin/curl";
};
};
};
};
};
};
};
}
) monitorMethods
));
testScript = ''
start_all()
server.wait_for_unit("caddy.service")
server.wait_for_open_port(80)
testScript =
''
start_all()
server.wait_for_unit("caddy.service")
server.wait_for_open_port(80)
''
+ lib.concatLines (
map (m: ''
client_blocked_${m}.wait_for_unit("opensnitchd.service")
client_blocked_${m}.fail("curl http://server")
clientBlocked.wait_for_unit("opensnitchd.service")
clientBlocked.fail("curl http://server")
clientAllowed.wait_for_unit("opensnitchd.service")
clientAllowed.succeed("curl http://server")
'';
client_allowed_${m}.wait_for_unit("opensnitchd.service")
client_allowed_${m}.succeed("curl http://server")
'') monitorMethods
);
}
)
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "kmetronome";
version = "1.4.0";
version = "1.4.1";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
hash = "sha256-51uFAPR0xsY3z9rFc8SdSGu4ae/VzUmC1qC8RGdt48Y=";
hash = "sha256-FJVmSMu0KDoq8DHRxxGyHQQflPCvH1h+WdsV9wcPAPA=";
};
nativeBuildInputs = [
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-unittest";
version = "0.6.3";
version = "0.7.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-OXl3Ax/sqCNcj2uDb0VctJ6Njrd5blkFuur6FT9HOl4=";
hash = "sha256-Ma/UcG+DkUR2FqRKFGMjPxMXDrbcbytZVi59zaK1W0k=";
};
vendorHash = "sha256-i9H65843XynaaNQLIQkBcgDsjnft3nxz6eWdZM9Dn9U=";
vendorHash = "sha256-7LI08qFcNRyZEZXVWpu2PR2PwpRlcTLIcE05Y5YgABg=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''
@@ -12,7 +12,7 @@ let
stable = "0.0.78";
ptb = "0.0.124";
canary = "0.0.549";
development = "0.0.56";
development = "0.0.60";
}
else
{
@@ -38,7 +38,7 @@ let
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-pxoFT1P/F/0Mhy5sECZlzIxrHK+/Y8Sy5BvgvNYRfM4=";
hash = "sha256-SL+lWMSXC1Y11Sk59sE7F8n04DED2365RKKeKFU8R6o=";
};
};
x86_64-darwin = {
@@ -22,14 +22,14 @@
mkDerivation rec {
pname = "kaidan";
version = "0.9.2";
version = "0.10.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
hash = "sha256-2UzXWd/fR5UwGywebYGWhh817x+VC76zmVaVZSBOg7M=";
hash = "sha256-u+8uNBDfszH5YJokie4A2QhW04ANq/JTwkMeu5gY0to=";
};
nativeBuildInputs = [
@@ -88,6 +88,7 @@ let
harfbuzz
liberation_ttf
libjpeg
libpng
libpulseaudio
libtiff
libudev0-shim
+2 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "qctools";
version = "1.3.1";
version = "1.4";
src = fetchurl {
url = "https://mediaarea.net/download/source/${pname}/${version}/${pname}_${version}.tar.xz";
hash = "sha256-ClF8KiVjV2JTCjz/ueioojhiHZf8UW9WONaJrIx4Npo=";
hash = "sha256-1WqCP/4PV8hQT8ubPxHGTwZrRnOPm+msEPBGR4gkWhA=";
};
sourceRoot = "${pname}/Project/QtCreator";
+1
View File
@@ -120,6 +120,7 @@ stdenvNoCC.mkDerivation {
passthru = {
gitRepoUrl = url;
inherit tag;
};
}
))
+4 -2
View File
@@ -59,12 +59,14 @@ let
gitRepoUrl = "${baseUrl}.git";
revWithTag = if tag != null then "refs/tags/${tag}" else rev;
fetcherArgs = (if useFetchGit
then {
inherit tag rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl;
} // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
else {
url = "${baseUrl}/archive/${if tag != null then "refs/tags/${tag}" else rev}.tar.gz";
url = "${baseUrl}/archive/${revWithTag}.tar.gz";
passthru = {
inherit gitRepoUrl;
@@ -73,5 +75,5 @@ let
) // privateAttrs // passthruAttrs // { inherit name; };
in
fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo tag; }
fetcher fetcherArgs // { meta = newMeta; inherit owner repo tag; rev = revWithTag; }
)
+4 -5
View File
@@ -37,10 +37,9 @@ lib.makeOverridable (
repo
]
);
revWithTag = if tag != null then "refs/tags/" + tag else rev;
escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] (
if tag != null then "refs/tags/" + tag else rev
);
escapedRevWithTag = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] revWithTag;
passthruAttrs = removeAttrs args [
"protocol"
"domain"
@@ -77,7 +76,7 @@ lib.makeOverridable (
}
else
{
url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRevWithTag}";
passthru = {
inherit gitRepoUrl;
@@ -95,9 +94,9 @@ lib.makeOverridable (
meta.homepage = "${protocol}://${domain}/${slug}/";
inherit
tag
rev
owner
repo
;
rev = revWithTag;
}
)
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "albert";
version = "0.26.10";
version = "0.26.11";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${finalAttrs.version}";
hash = "sha256-GVYRcrSXz4EXb3isoUN3x/68CAfr0wMgnvv+CzW/yZY=";
hash = "sha256-rPQ6nxUT7qiuOgmmQKCrYHl4kKJODe+nw4VNGjF+n/g=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -78,13 +78,13 @@ let
in
stdenv.mkDerivation {
pname = "ansel";
version = "0-unstable-2024-10-28";
version = "0-unstable-2024-12-19";
src = fetchFromGitHub {
owner = "aurelienpierreeng";
repo = "ansel";
rev = "7f23d9d38630629e559e76073ec4dbe71733c225";
hash = "sha256-2AEQlt75nnVD8ZFpVUEvgxRV94NtWDK0R+zVd/ytXuU=";
rev = "854924f0cefd485ede726eb060b765712c0d393c";
hash = "sha256-G8+A4c2d6OFfYo7T5sk8JsDw5RrNnH5Bmmo8YkCsbsA=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster";
version = "0.9.13";
version = "0.9.14";
src = fetchFromGitHub {
owner = "rtbrick";
repo = "bngblaster";
rev = finalAttrs.version;
hash = "sha256-fMaa4UCERsZ/LIXJT4XIeb0TLYAJVzhdFFd+56n6ASA=";
hash = "sha256-vToKrP/T3qVb9UylNyZRvP+kWoizIjjXTbVlNebKG/M=";
};
nativeBuildInputs = [ cmake ];
+6 -21
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "bpftrace";
version = "0.21.2";
version = "0.21.3";
src = fetchFromGitHub {
owner = "bpftrace";
repo = "bpftrace";
rev = "v${version}";
hash = "sha256-/2m+5iFE7R+ZEc/VcgWAhkLD/jEK88roUUOUyYODi0U=";
hash = "sha256-cmKm2g1lzl625t4z7ZM04QgqDubBsCMqtibXmg+3y9w=";
};
buildInputs = with llvmPackages; [
@@ -52,31 +52,15 @@ stdenv.mkDerivation rec {
util-linux
];
# tests aren't built, due to gtest shenanigans. see:
#
# https://github.com/bpftrace/bpftrace/issues/161#issuecomment-453606728
# https://github.com/bpftrace/bpftrace/pull/363
#
cmakeFlags = [
"-DBUILD_TESTING=FALSE"
"-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
"-DINSTALL_TOOL_DOCS=OFF"
"-DSYSTEM_INCLUDE_PATHS=${glibc.dev}/include"
];
patches = [
(fetchpatch {
name = "runqlat-bt-no-includes.patch";
url = "https://github.com/bpftrace/bpftrace/pull/3262.patch";
hash = "sha256-9yqaZeG1Uf2cC9Aa40c2QUTQRl8n2NO1nq278hf9P4M=";
})
(fetchpatch {
name = "kheaders-not-found-message-only-on-error.patch";
url = "https://github.com/bpftrace/bpftrace/pull/3265.patch";
hash = "sha256-8AICMzwq5Evy9+hmZhFjccw/HmgZ9t+YIoHApjLv6Uc=";
excludes = [ "CHANGELOG.md" ];
})
];
postPatch = ''
substituteInPlace CMakeLists.txt --replace "set(MAX_LLVM_MAJOR 18)" "set(MAX_LLVM_MAJOR 19)"
'';
# Pull BPF scripts into $PATH (next to their bcc program equivalents), but do
# not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working.
@@ -107,6 +91,7 @@ stdenv.mkDerivation rec {
thoughtpolice
martinetd
mfrw
illustris
];
platforms = platforms.linux;
};
+4 -4
View File
@@ -1,12 +1,12 @@
{
"dependencies": {
"ae": {
"version": "0.0.3236",
"sha256": "0by9yclvk795nw7ilwhv7wh17j2dd7xk54phs8s5jxrwpqx10x52"
"version": "0.0.3461",
"sha256": "1mk075r3bas8s699y6sc4fxbdyjhc9cm6qxcqqaj0di9ijb71fq1"
},
"btrfs": {
"version": "0.0.18",
"sha256": "0m8r4skfiryn2nk4wyb61lpvlga1330crr4y1h0q39g9xl3g6myf"
"version": "0.0.21",
"sha256": "0j7ksngwn8kilbql6p7hh5jvmrxqsr7pniw2n1qlrwdsms6qv72m"
},
"ncurses": {
"version": "1.0.0",
+2 -2
View File
@@ -8,13 +8,13 @@
buildDubPackage rec {
pname = "btdu";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "CyberShadow";
repo = "btdu";
rev = "v${version}";
hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE=";
hash = "sha256-B8ojxdXibeNEZay9S5lzpB6bTKNB2ZI6AQ3XKUHioE0=";
};
dubLock = ./dub-lock.json;
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "clickhouse-backup";
version = "2.6.4";
version = "2.6.5";
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
rev = "v${version}";
hash = "sha256-e5PeMe4mk91PpEP0f+08Hr+Q97WfVGE7PDN4DI+9Quw=";
hash = "sha256-tRZo2PQYCzryd593MTzrHOzVxM58ONz61A6eekyr1wo=";
};
vendorHash = "sha256-2F3H+Sbrw4Q782Y6gE3KvnXXmiZdSLrJr6AVBHSg9gA=";
vendorHash = "sha256-skL0yF0sVj3yza0LseNLfUn3jxPXuOFS/1FfHg0/H7Q=";
ldflags = [
"-X main.version=${version}"
@@ -27,6 +27,8 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X"
"codeberg.org/codeberg/pages/server/version.Version=${version}"
];
tags = [
+6 -4
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "codecrafters-cli";
version = "34";
version = "35";
src = fetchFromGitHub {
owner = "codecrafters-io";
repo = "cli";
rev = "v${version}";
hash = "sha256-+daBduhjUt7lrjTdXgm1qpZN1oEHC3Nx+ZiOLoO5+s4=";
hash = "sha256-gCSlXI8DggQts7Em1onD4B5CxrfAlPuwovWRUgpsu/E=";
# A shortened git commit hash is part of the version output, and is
# needed at build time. Use the `.git` directory to retrieve the
# commit SHA, and remove the directory afterwards since it is not needed
@@ -25,7 +25,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-TQcxzfiqKeCQZUKLHnPjBa/0WsYJhER3fmr4cRGFknw=";
vendorHash = "sha256-lRDHe/7kCy8T4paA/6FVfM/sjBpvcGWLeW7b+dOnFo0=";
ldflags = [
"-s"
@@ -38,7 +38,9 @@ buildGoModule rec {
ldflags+=" -X github.com/codecrafters-io/cli/internal/utils.Commit=$(cat COMMIT)"
'';
doCheck = true;
# We need to disable tests because the tests for respecting .gitignore
# include setting up a global gitignore which doesn't work.
doCheck = false;
nativeBuildInputs = [ git ];
+16 -6
View File
@@ -15,19 +15,29 @@
writers,
python3Packages,
nix-update,
fetchpatch,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ecwolf";
version = "1.4.1";
src = fetchFromBitbucket {
owner = pname;
repo = pname;
rev = version;
sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
owner = "ecwolf";
repo = "ecwolf";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
};
patches = [
# Fixes build with gcc >= 14. Shouldn't be needed for ecwolf versions > 1.4.1.
(fetchpatch {
name = "tmemory.h-const-correctness.patch";
url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw";
hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@@ -105,4 +115,4 @@ stdenv.mkDerivation rec {
];
platforms = platforms.all;
};
}
})
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "fig2dev";
version = "3.2.9";
version = "3.2.9a";
src = fetchurl {
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
hash = "sha256-FeJGyNE8xy3iXggxQDitUM59Le+pzxr8Fy/X9ZMgkLE=";
hash = "sha256-YeGFOTF2hS8DuQGzsFsZ+8Wtglj/FC89pucLG4NRMyY=";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation rec {
pname = "firewalld";
version = "2.2.3";
version = "2.3.0";
src = fetchFromGitHub {
owner = "firewalld";
repo = "firewalld";
rev = "v${version}";
sha256 = "sha256-ugDleco/Ep+10ku+5xcW4zq/RrhruZCRlX0zKeXzLhg=";
sha256 = "sha256-ubE1zMIOcdg2+mgXsk6brCZxS1XkvJYwVY3E+UXIIiU=";
};
patches = [
+3
View File
@@ -2,6 +2,7 @@
rustPlatform,
fetchFromSourcehut,
lib,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
@@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-EquriyhfbYyi87TP3zuLiCXDV7baDRaTRuZd7Yht/UA=";
passthru.updateScript = nix-update-script { };
meta = {
description = "FiLe InteRacT, the file interaction tool for your command line";
homepage = "https://git.sr.ht/~hadronized/flirt";
+2 -2
View File
@@ -27,7 +27,7 @@
}:
let
version = "1.19.0";
version = "1.20.0";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
owner = "dnkl";
repo = "foot";
rev = version;
hash = "sha256-EY6VNrAxqA20RHLqfusbdxJPfEE7Fchi1W0noHfbxws=";
hash = "sha256-bvU8A2y/9ETqgFtBUZ5wp0dXybTCLl32yY/BB6r/pd8=";
};
separateDebugInfo = true;
+6
View File
@@ -2,6 +2,7 @@
cmake,
darwin,
fetchFromGitHub,
SDL2,
ffmpeg_6,
fontconfig,
git,
@@ -65,6 +66,7 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[
SDL2
ffmpeg_6
fontconfig
libGL
@@ -98,9 +100,13 @@ rustPlatform.buildRustPackage rec {
'';
postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
# We don't want the bundled libraries.
rm -rf $out/lib
patchelf $out/bin/gossip \
--add-rpath ${
lib.makeLibraryPath [
SDL2
libGL
libxkbcommon
wayland
+3 -3
View File
@@ -32,11 +32,11 @@
}:
mkDerivation {
pname = "gren";
version = "0.4.5";
version = "0.5.2";
src = fetchgit {
url = "https://github.com/gren-lang/compiler.git";
sha256 = "0hbxzn14m9y7sqwk347yj7hblwmj5fyzmy7kjqc8zjd63gmrkdh8";
rev = "0efe25e3f48663a36eec525d2df0d957f53c9b4e";
sha256 = "1mksfma6c1dn091ab4x794hs71v44bx294wbn80qfc5kgrrl5lf4";
rev = "ee19481f5715b78cad8be09e29e56dcb82d65f4f";
fetchSubmodules = true;
};
isLibrary = false;
+2 -2
View File
@@ -11,12 +11,12 @@
stdenv.mkDerivation rec {
pname = "grpc_cli";
version = "1.68.2";
version = "1.69.0";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-GxD/1qoLIjQzgYyNuK4zLvBZtOcV+w+KamnUS2qcesw=";
hash = "sha256-rRiPUcr6of/sjqB+qr7eOkKVFGTnu8UjluULmcn8df4=";
fetchSubmodules = true;
};
nativeBuildInputs = [
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gtklock-userinfo-module";
version = "4.0.0";
version = "4.0.1";
src = fetchFromGitHub {
owner = "jovanlanik";
repo = "gtklock-userinfo-module";
rev = "v${finalAttrs.version}";
hash = "sha256-d9S0Tj7aII2JQ5/PZmt8HaUIb5caoD4GND0PGvuRMn8=";
hash = "sha256-4k50UBy3FplTL0/utFQ7tKi0eGofmgXr1iFVTN/SGok=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hacompanion";
version = "1.0.15";
version = "1.0.17";
src = fetchFromGitHub {
owner = "tobias-kuendig";
repo = "hacompanion";
rev = "v${version}";
hash = "sha256-FR2IowbaHXr9x/eMt+NCuGusMwX2iVxPOuWEkhH2GFM=";
hash = "sha256-TGYBNsHM92B65LsBwVp9mZgdYkJAvQFyIqknRFqXFaQ=";
};
vendorHash = "sha256-ZZ8nxN+zUeFhSXyoHLMgzeFllnIkKdoVnbVK5KjrLEQ=";
vendorHash = "sha256-y2eSuMCDZTGdCs70zYdA8NKbuPPN5xmnRfMNK+AE/q8=";
meta = {
changelog = "https://github.com/tobias-kuendig/hacompanion/releases/tag/v${version}";
@@ -0,0 +1,184 @@
From d4d4a299de39685e59f256c81d8e60ce6efd8b23 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 1 Jan 2025 18:02:40 +0100
Subject: [PATCH] build: enable specifying custom sass compiler path by env-var
Signed-off-by: Felix Buehler <account@buehler.rocks>
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
package.json | 7 ++++++-
patches/sass-embedded.patch | 15 +++++++++++++++
pnpm-lock.yaml | 35 ++++++++++++++++++++---------------
3 files changed, 41 insertions(+), 16 deletions(-)
create mode 100644 patches/sass-embedded.patch
diff --git a/package.json b/package.json
index b66e6ff..94aaa86 100644
--- a/package.json
+++ b/package.json
@@ -28,5 +28,10 @@
"vite-plugin-pwa": "^0.21.0"
},
"license": "Apache-2.0",
- "packageManager": "pnpm@9.14.2+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387"
+ "packageManager": "pnpm@9.14.2+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387",
+ "pnpm": {
+ "patchedDependencies": {
+ "sass-embedded": "patches/sass-embedded.patch"
+ }
+ }
}
diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
new file mode 100644
index 0000000..f941a8e
--- /dev/null
+++ b/patches/sass-embedded.patch
@@ -0,0 +1,15 @@
+diff --git a/dist/lib/src/compiler-path.js b/dist/lib/src/compiler-path.js
+index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
+--- a/dist/lib/src/compiler-path.js
++++ b/dist/lib/src/compiler-path.js
+@@ -24,6 +24,10 @@ function isLinuxMusl(path) {
+ }
+ /** The full command for the embedded compiler executable. */
+ exports.compilerCommand = (() => {
++ const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
++ if (binPath) {
++ return [binPath];
++ }
+ const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
+ ? 'linux-musl'
+ : process.platform;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ecc1e3c..a7164d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,11 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+patchedDependencies:
+ sass-embedded:
+ hash: 6wjvcsryx2tfkpottp4wf5nbzi
+ path: patches/sass-embedded.patch
+
importers:
.:
@@ -26,7 +31,7 @@ importers:
devDependencies:
'@vitejs/plugin-vue':
specifier: ^5.2.0
- version: 5.2.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)
+ version: 5.2.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)
'@vue/eslint-config-prettier':
specifier: ^10.0.0
version: 10.0.0(eslint@9.15.0)(prettier@3.3.3)
@@ -44,13 +49,13 @@ importers:
version: 3.3.3
sass-embedded:
specifier: ^1.81.0
- version: 1.81.0
+ version: 1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
vite:
specifier: ^5.4.11
- version: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0)
+ version: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
vite-plugin-pwa:
specifier: ^0.21.0
- version: 0.21.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
+ version: 0.21.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
packages:
@@ -2548,7 +2553,7 @@ snapshots:
'@babel/code-frame@7.25.7':
dependencies:
'@babel/highlight': 7.25.7
- picocolors: 1.1.0
+ picocolors: 1.1.1
'@babel/compat-data@7.25.8': {}
@@ -2715,7 +2720,7 @@ snapshots:
'@babel/helper-validator-identifier': 7.25.7
chalk: 2.4.2
js-tokens: 4.0.0
- picocolors: 1.1.0
+ picocolors: 1.1.1
'@babel/parser@7.25.8':
dependencies:
@@ -3521,9 +3526,9 @@ snapshots:
'@types/trusted-types@2.0.7': {}
- '@vitejs/plugin-vue@5.2.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)':
+ '@vitejs/plugin-vue@5.2.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)':
dependencies:
- vite: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0)
+ vite: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
vue: 3.5.13
'@vue/compiler-core@3.5.13':
@@ -4702,7 +4707,7 @@ snapshots:
sass-embedded-win32-x64@1.81.0:
optional: true
- sass-embedded@1.81.0:
+ sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
dependencies:
'@bufbuild/protobuf': 2.2.0
buffer-builder: 0.2.0
@@ -4879,7 +4884,7 @@ snapshots:
terser@5.35.0:
dependencies:
'@jridgewell/source-map': 0.3.6
- acorn: 8.13.0
+ acorn: 8.14.0
commander: 2.20.3
source-map-support: 0.5.21
@@ -4975,7 +4980,7 @@ snapshots:
dependencies:
browserslist: 4.24.0
escalade: 3.2.0
- picocolors: 1.1.0
+ picocolors: 1.1.1
uri-js@4.4.1:
dependencies:
@@ -4987,18 +4992,18 @@ snapshots:
varint@6.0.0: {}
- vite-plugin-pwa@0.21.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
+ vite-plugin-pwa@0.21.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
dependencies:
debug: 4.3.7
pretty-bytes: 6.1.1
tinyglobby: 0.2.10
- vite: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0)
+ vite: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
workbox-build: 7.1.0
workbox-window: 7.1.0
transitivePeerDependencies:
- supports-color
- vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0):
+ vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0):
dependencies:
esbuild: 0.21.5
postcss: 8.4.47
@@ -5006,7 +5011,7 @@ snapshots:
optionalDependencies:
fsevents: 2.3.3
sass: 1.79.5
- sass-embedded: 1.81.0
+ sass-embedded: 1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
terser: 5.35.0
vue-eslint-parser@9.4.3(eslint@9.15.0):
--
2.47.0
+11 -5
View File
@@ -5,15 +5,16 @@
pnpm,
nodejs,
dart-sass,
nix-update-script,
}:
stdenvNoCC.mkDerivation rec {
pname = "homer";
version = "24.11.4";
version = "24.12.1";
src = fetchFromGitHub {
owner = "bastienwirtz";
repo = "homer";
rev = "v${version}";
hash = "sha256-UaoBdYzTEYB1pkiTYrt4T7GjwMJWXPuW5VSl4MU8DCI=";
hash = "sha256-nOhovVqWlHPunwruJrgqFhhDxccKBp/iEyB3Y3C5Cz8=";
};
pnpmDeps = pnpm.fetchDeps {
@@ -23,11 +24,11 @@ stdenvNoCC.mkDerivation rec {
src
patches
;
hash = "sha256-5unoY8lPaX9sZAJEBICpxSddwLV8liK1tbamB2ulvew=";
hash = "sha256-+FijxCiI5pr6kp+/99DJJOJSI9w6pbtfW25SUyEcWio=";
};
# Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
patches = [ ./sass-embedded.patch ];
patches = [ ./0001-build-enable-specifying-custom-sass-compiler-path-by.patch ];
nativeBuildInputs = [
nodejs
@@ -53,12 +54,17 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "A very simple static homepage for your server.";
homepage = "https://homer-demo.netlify.app/";
changelog = "https://github.com/bastienwirtz/homer/releases";
license = licenses.asl20;
maintainers = with maintainers; [ stunkymonkey ];
maintainers = with maintainers; [
stunkymonkey
christoph-heiss
];
platforms = platforms.all;
};
}
-133
View File
@@ -1,133 +0,0 @@
diff --git a/package.json b/package.json
index f121431..97f1b11 100644
--- a/package.json
+++ b/package.json
@@ -28,5 +28,10 @@
"vite-plugin-pwa": "^0.20.5"
},
"license": "Apache-2.0",
- "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
+ "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4",
+ "pnpm": {
+ "patchedDependencies": {
+ "sass-embedded": "patches/sass-embedded.patch"
+ }
+ }
}
diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
new file mode 100644
index 0000000..f941a8e
--- /dev/null
+++ b/patches/sass-embedded.patch
@@ -0,0 +1,15 @@
+diff --git a/dist/lib/src/compiler-path.js b/dist/lib/src/compiler-path.js
+index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
+--- a/dist/lib/src/compiler-path.js
++++ b/dist/lib/src/compiler-path.js
+@@ -24,6 +24,10 @@ function isLinuxMusl(path) {
+ }
+ /** The full command for the embedded compiler executable. */
+ exports.compilerCommand = (() => {
++ const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
++ if (binPath) {
++ return [binPath];
++ }
+ const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
+ ? 'linux-musl'
+ : process.platform;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4c4267a..fd278e1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,11 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+patchedDependencies:
+ sass-embedded:
+ hash: 6wjvcsryx2tfkpottp4wf5nbzi
+ path: patches/sass-embedded.patch
+
importers:
.:
@@ -26,7 +31,7 @@ importers:
devDependencies:
'@vitejs/plugin-vue':
specifier: ^5.1.4
- version: 5.1.4(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)
+ version: 5.1.4(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)
'@vue/eslint-config-prettier':
specifier: ^10.0.0
version: 10.0.0(eslint@9.12.0)(prettier@3.3.3)
@@ -44,13 +49,13 @@ importers:
version: 3.3.3
sass-embedded:
specifier: ^1.79.5
- version: 1.79.5
+ version: 1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
vite:
specifier: ^5.4.9
- version: 5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0)
+ version: 5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
vite-plugin-pwa:
specifier: ^0.20.5
- version: 0.20.5(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
+ version: 0.20.5(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
packages:
@@ -3516,9 +3521,9 @@ snapshots:
'@types/trusted-types@2.0.7': {}
- '@vitejs/plugin-vue@5.1.4(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)':
+ '@vitejs/plugin-vue@5.1.4(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)':
dependencies:
- vite: 5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0)
+ vite: 5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
vue: 3.5.12
'@vue/compiler-core@3.5.12':
@@ -4693,7 +4698,7 @@ snapshots:
sass-embedded-win32-x64@1.79.5:
optional: true
- sass-embedded@1.79.5:
+ sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
dependencies:
'@bufbuild/protobuf': 2.2.0
buffer-builder: 0.2.0
@@ -4975,18 +4980,18 @@ snapshots:
varint@6.0.0: {}
- vite-plugin-pwa@0.20.5(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
+ vite-plugin-pwa@0.20.5(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
dependencies:
debug: 4.3.7
pretty-bytes: 6.1.1
tinyglobby: 0.2.9
- vite: 5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0)
+ vite: 5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
workbox-build: 7.1.0
workbox-window: 7.1.0
transitivePeerDependencies:
- supports-color
- vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0):
+ vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0):
dependencies:
esbuild: 0.21.5
postcss: 8.4.47
@@ -4994,7 +4999,7 @@ snapshots:
optionalDependencies:
fsevents: 2.3.3
sass: 1.79.5
- sass-embedded: 1.79.5
+ sass-embedded: 1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
terser: 5.35.0
vue-eslint-parser@9.4.3(eslint@9.12.0):
--
2.47.0
+3 -3
View File
@@ -21,16 +21,16 @@
rustPlatform.buildRustPackage rec {
pname = "irust";
version = "1.71.29";
version = "1.71.30";
src = fetchFromGitHub {
owner = "sigmaSd";
repo = "IRust";
rev = "irust@${version}";
hash = "sha256-UKq9sFLhgx1eg0jKhb47NH/HaSdwegh1gES7naXXup0=";
hash = "sha256-moYHi+hkL2I3jm3eBfaXuK4Zz84Pq2X50V5lKyIMecM=";
};
cargoHash = "sha256-GW2IqWyFkohFTzCqxJoj/U9gi/IrSfG0bXQl7OFc+kI=";
cargoHash = "sha256-Ecz4JulISoDMrRloqbOP1T+mwoWDV+COwJR/+0fPNXc=";
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-router";
version = "2.3.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "cloudnativelabs";
repo = pname;
rev = "v${version}";
hash = "sha256-eyO8eMlxWobUQBuswh4kM07kJV3fsRz4gTeP/tIR3aM=";
hash = "sha256-N1AC4r5NLW7hxBHGFRKcDZ1sLLKlcqqNmXeh8Zt3l1g=";
};
vendorHash = "sha256-KmAMGKm+cFGRMD1Nyn9/CHv9vUvflAiLJcro08GIGtw=";
vendorHash = "sha256-Yai6nszdaw2TwOi9N3BkY/4zz2aJGdCqWskHmnBKTDk=";
env.CGO_ENABLED = 0;
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "last";
version = "1592";
version = "1607";
src = fetchFromGitLab {
owner = "mcfrith";
repo = "last";
rev = "refs/tags/${version}";
hash = "sha256-ZZdIOUKyA+TvWHOV5JU1LUnh3hSDBqXhJK9a/frVMF0=";
hash = "sha256-AHaKE9il4GZ5JhCqmScqG/rTHEOA8+A421pbdrDHZeY=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "latex2html";
version = "2024";
version = "2024.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-MF+S6x+k+lkutJQ60HCxFpdR96K3AFZcP/4guK9RvsA=";
sha256 = "sha256-4g6bX6aVPOzSHTOB9wsfIiqS0SWygFtfeUDHT13FutA=";
};
buildInputs = [ ghostscript netpbm perl ];
+4 -4
View File
@@ -8,20 +8,20 @@
let
pname = "lens-desktop";
version = "2024.3.191333";
version = "2024.11.261604";
sources = {
x86_64-linux = {
url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage";
hash = "sha256-OywOjXzeW/5uyt50JrutiLgem9S1CrlwPFqfK6gUc7U=";
hash = "sha256-AbuEU5gOckVU+eDIFnomc7ryLq68ihuk3c0XosoJp74=";
};
x86_64-darwin = {
url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg";
hash = "sha256-yf+WBcOdOM3XsfiXJThVws2r84vG2jwfNV1c+sq6A4s=";
hash = "sha256-MQQRGTCe+LEHXJi6zjnpENbtlWNP+XVH9rWXRMk+26w=";
};
aarch64-darwin = {
url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg";
hash = "sha256-hhd8MnwKWpvG7UebkeEoztS45SJVnpvvJ9Zy+y5swik=";
hash = "sha256-aakJCLnQBAnUdrrniTcahS+q3/kP09mlaPTV8FW5afI=";
};
};
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
-e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am
'';
CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration";
CFLAGS = "-Wno-error=implicit-function-declaration";
doCheck = true;
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libvpl";
version = "2.13.0";
version = "2.14.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libvpl";
rev = "v${finalAttrs.version}";
hash = "sha256-H+pRdpk1B/QgsXaTxhQfm3JW5Plgz4esrUV1kKfjY1s=";
hash = "sha256-51kl9w1xqldQXGWbk6bveS2jMZWQOz/gYP/hPXDk/7M=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "likwid";
version = "5.4.0";
version = "5.4.1";
src = fetchurl {
url = "https://ftp.fau.de/pub/likwid/likwid-${version}.tar.gz";
hash = "sha256-DytnHGnKqZP+20gYezvcyUwiQA7ITJJv0ImNv/aKoD4=";
hash = "sha256-V3OFFFXbukieLjc1kx5RVHN3zReWyYKlrIjQ8imcCBE=";
};
nativeBuildInputs = [ perl ];
+3 -3
View File
@@ -12,18 +12,18 @@
stdenv.mkDerivation rec {
pname = "lxd-ui";
version = "0.14";
version = "0.15";
src = fetchFromGitHub {
owner = "canonical";
repo = "lxd-ui";
rev = "refs/tags/${version}";
hash = "sha256-mrJpoD8eq/LxZl0JJ0ZqnAvMqqNGqRfi9UUh40PD0TY=";
hash = "sha256-HqdaG51W7eUCGUhA+9pYrAWaA6qyK7Fc95CKJvk9GaA=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-dkATFNjAPhrPbXhcJ/R4eIpcagKEwBSnRfLwqTPIe6c=";
hash = "sha256-O7oEAjmCEmPpsO/rdkZVhUkxhFzhHpPRbmci3yRBA7g=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "macmon";
version = "0.3.3";
version = "0.5.1";
src = fetchFromGitHub {
owner = "vladkens";
repo = "macmon";
rev = "v${version}";
hash = "sha256-COpEjK1LUwGzhSgD09D4gx+MtS2hT0qt06rTPT8JQiQ=";
hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE=";
};
cargoHash = "sha256-DTkpFGl8kTWttFGKTCpny2L0IRrCgpnnXaKIFoxWrW4=";
cargoHash = "sha256-mE6PGWjaCFpqVoE1zISOqwt6o5SakjJM4sPRtU90lPA=";
meta = {
homepage = "https://github.com/vladkens/macmon";
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "makima";
version = "0.9.5";
version = "0.10.0";
src = fetchFromGitHub {
owner = "cyber-sushi";
repo = "makima";
rev = "v${version}";
hash = "sha256-yKaUDFrUEXXgYaGKuFnuViAEet2BVh1ZbGRo6wuC69g=";
hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o=";
};
cargoHash = "sha256-rtVO1pmWI2U+m8RVHjPEi++OtsLEjmXkhzpg6UkgNuE=";
cargoHash = "sha256-70gkCv9YHeHj1Hj9gLTvHTRULEJJwezaqSECWbgPIc4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev ];
+2
View File
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
PYTHONPATH=$out/lib/python/pyflow:$PYTHONPATH python -c 'import pyflowTaskWrapper; import pyflow'
'';
env.NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
meta = with lib; {
description = "Structural variant caller";
license = licenses.gpl3;
+6 -5
View File
@@ -2,22 +2,21 @@
, stdenvNoCC
, fetchurl
, unzip
, nix-update-script
}:
stdenvNoCC.mkDerivation rec {
pname = "net-news-wire";
version = "6.1.4";
version = "6.1.5";
src = fetchurl {
url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip";
hash = "sha256-dNdbniXGre8G2/Ac0GB3GHJ2k1dEiHmAlTX3dJOEC7s=";
hash = "sha256-92hsVSEpa661qhebeSd5lxt8MtIJRn7YZyKlMs0vle0=";
};
sourceRoot = ".";
nativeBuildInputs = [
unzip
];
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
@@ -26,6 +25,8 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "RSS reader for macOS and iOS";
longDescription = ''
+7 -4
View File
@@ -15,7 +15,7 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "netbox";
version = "4.1.3";
version = "4.1.7";
format = "other";
@@ -23,14 +23,17 @@ py.pkgs.buildPythonApplication rec {
owner = "netbox-community";
repo = "netbox";
rev = "refs/tags/v${version}";
hash = "sha256-SRzkmRkniVDu6vYGa9Kd9exob/LHpGBPd+lRA/pbCFo=";
hash = "sha256-0AyIXSiNsAHELM8Ry/bcm7sd7K+ApeoEguiEm8ecAU0=";
};
patches = [
./custom-static-root.patch
# Rebase of PR 17620 "Upgrade to Django 5.1"
# https://github.com/netbox-community/netbox/pull/17620
(fetchpatch {
url = "https://github.com/netbox-community/netbox/pull/17620.patch";
hash = "sha256-zN2zke4qlNJUbxI8mSV+zGmEv0Qtd0zSCbCXWyE1L2k=";
url = "https://github.com/netbox-community/netbox/commit/cda9e0525dc850ddd82bf46762a64607bf97df83.patch";
hash = "sha256-iJiz5f926Np1k4c9DpfPe0HefJy1CH6c0wjwBIt1vWQ=";
})
];
+93 -78
View File
@@ -1,18 +1,18 @@
[
{
"pname": "Cake.Scripting.Abstractions",
"version": "0.15.0",
"hash": "sha256-g/94sPb+uLZWEK83pFq/w924q1iBuJftoJkZ/UlJAVo="
"version": "0.16.0",
"hash": "sha256-oATZ5EcHQFQNy4BOAaDmtIybP3PlzphD4L2ojEz061k="
},
{
"pname": "Cake.Scripting.Transport",
"version": "0.15.0",
"hash": "sha256-VY1Lw6cy6k8KOP7A2GLm2V+KuVJ43QrbilEzrZqy9Hc="
"version": "0.16.0",
"hash": "sha256-JS9CZdwv64g99XLTb5RavKtvMQNooSZOCNLKgKWWNb8="
},
{
"pname": "Cake.Tool",
"version": "3.0.0",
"hash": "sha256-Z5hkinAqOaWCfMUIaaDfY0uTN1ot71Q1IC1A+xpmSj4="
"version": "4.2.0",
"hash": "sha256-YWF+MCsMyMa+DBblh+998lorErO7RLqdl9CiCU8bbnE="
},
{
"pname": "Dotnet.Script.DependencyModel",
@@ -86,8 +86,8 @@
},
{
"pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.3.4",
"hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
"version": "3.11.0",
"hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
},
{
"pname": "Microsoft.CodeAnalysis.AnalyzerUtilities",
@@ -96,33 +96,33 @@
},
{
"pname": "Microsoft.CodeAnalysis.Common",
"version": "4.12.0-1.24358.3",
"hash": "sha256-UQ0tDpF+OxAgRXIPiJuT7z01Weqn2bLo+kIwkdcMaXs=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.12.0-1.24358.3/microsoft.codeanalysis.common.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-VSPRpTzEXnTNQAxXDOOi6YVS2C6/S2zTKgQR4aNkxME=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.13.0-3.24620.4/microsoft.codeanalysis.common.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.CSharp",
"version": "4.12.0-1.24358.3",
"hash": "sha256-OuB9qEQLc64Ido++o3mAZUZ6IvuB8rTzOf663k/0Kcc=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-YGxCN8J3BjSZ9hXYQF0nCL3Welv3UVASeSTkwwFPchc=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Features",
"version": "4.12.0-1.24358.3",
"hash": "sha256-PNPdyFwwsReDd1QC1KmnGrXVMYNPghIShI7il3UEcrA=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.features.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-qpNsw5OtTAQFnN6g6tIh6+nsr+zc+/Na+oETR/GWxeM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.features.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
"version": "4.12.0-1.24358.3",
"hash": "sha256-titifcvaYU0rc9ZoEoitT2Wbw/CDRYr7bRm1ecSLDU0=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.scripting.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-1D+TjiljZQQJEYIzhdLAbLq8DIvW30vgSDYnDlPoGoU=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.scripting.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
"version": "4.12.0-1.24358.3",
"hash": "sha256-9CROWJt789h964idgJ/qqu+rAQkygcwtE2ngyeL/bhE=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.workspaces.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-NT7yDEq4fW8c71xHC3YPsP5vl8AZ9PdKASzxROwhccs=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.workspaces.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Elfie",
@@ -131,39 +131,39 @@
},
{
"pname": "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore",
"version": "4.12.0-1.24358.3",
"hash": "sha256-0kv2XunbYQsbusmRl2WchiskolxwZWThx80ZUzcw3c8=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.aspnetcore.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-91ZFqiu4MlteCir6p7YrOtbUMuRNIpNr6jX5qLdmZgM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.aspnetcore.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp",
"version": "4.12.0-1.24358.3",
"hash": "sha256-gLIJA1zaq4RbRCDhALlIwUBasRbekjFiuLCNyQckegA=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-o2+DeY/p5AxMkMnYIiNMyMtrAnazzgfC6cVY8lImz4E=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.omnisharp.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp",
"version": "4.12.0-1.24358.3",
"hash": "sha256-aXwLNsh6Gmd98rLZ1fWjpNaCCg7TYv70Qc7dRccNk/U=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-LfIgqc7lDoyxbOsGmF4Ji488iXaT1f2ecjZz1662WlM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Features",
"version": "4.12.0-1.24358.3",
"hash": "sha256-TCl/MzgHNUBUU56MVSGeOlCUMSTeS8cG5iZkZ/E9ElY=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.12.0-1.24358.3/microsoft.codeanalysis.features.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-ITkMz+1b9Q9I5UZk4N5+qKD7FPTBMohLDOqx3e2hShI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.13.0-3.24620.4/microsoft.codeanalysis.features.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Scripting.Common",
"version": "4.12.0-1.24358.3",
"hash": "sha256-qvmZdcshzsXJLdWev3QyQscNeliEqzOGE3q7L/hR67w=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.12.0-1.24358.3/microsoft.codeanalysis.scripting.common.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-9Pch1BIrhsEwoI3ahgQM4BQBhw1wH9d8X9WB6deM3Sk=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.13.0-3.24620.4/microsoft.codeanalysis.scripting.common.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CodeAnalysis.Workspaces.Common",
"version": "4.12.0-1.24358.3",
"hash": "sha256-9SQ1nAfJsDswOfASVSZ2iV7GoXcsRmNhVcr+Dv266zk=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.12.0-1.24358.3/microsoft.codeanalysis.workspaces.common.4.12.0-1.24358.3.nupkg"
"version": "4.13.0-3.24620.4",
"hash": "sha256-Ex39ayopBTApxMCjevqn1qVFgjEvbst9sf7twW6+osI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.13.0-3.24620.4/microsoft.codeanalysis.workspaces.common.4.13.0-3.24620.4.nupkg"
},
{
"pname": "Microsoft.CSharp",
@@ -187,8 +187,8 @@
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
"version": "8.0.0",
"hash": "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="
"version": "8.0.1",
"hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="
},
{
"pname": "Microsoft.Extensions.Configuration",
@@ -235,6 +235,11 @@
"version": "8.0.0",
"hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "8.0.2",
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "8.0.0",
@@ -262,13 +267,13 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "7.0.1",
"hash": "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="
"version": "8.0.0",
"hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.0",
"hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
"version": "8.0.2",
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
@@ -282,8 +287,8 @@
},
{
"pname": "Microsoft.Extensions.Options",
"version": "8.0.0",
"hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
"version": "8.0.2",
"hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
},
{
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
@@ -387,57 +392,57 @@
},
{
"pname": "NuGet.Common",
"version": "6.11.0-rc.110",
"hash": "sha256-S0K+RiSHJFzx+qbTJ7KY1Mh/L9hDJfL/F1YjzlhP3ao=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.11.0-rc.110/nuget.common.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-SeN5m2Wuwux9kO+S5qX6bvvYUA22BOZDz6rg2Gk0vQc=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.13.0-rc.95/nuget.common.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.Configuration",
"version": "6.11.0-rc.110",
"hash": "sha256-NJzuKWDMUAn8aLt/aB4xht65a9CCnwY0IfnHfFHd/p4=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.11.0-rc.110/nuget.configuration.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-vrqUvp0Nse6zITKySrVgnPpkl2+ic8f0d/veYrUeRzM=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.13.0-rc.95/nuget.configuration.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.DependencyResolver.Core",
"version": "6.11.0-rc.110",
"hash": "sha256-12oRGUo4L7TslA6iV3OoMayG/t3ToOJ4fdGFh2U8Rxo=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.11.0-rc.110/nuget.dependencyresolver.core.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-ttllWdeTVn3JJECrqfCy9lVZKX7DQbgxjKMIBZH3GoI=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.13.0-rc.95/nuget.dependencyresolver.core.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.Frameworks",
"version": "6.11.0-rc.110",
"hash": "sha256-FmvFhdCJ/xH92tr+7uMNdimcpFxyW7Y/roPcS0TJX3g=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.11.0-rc.110/nuget.frameworks.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-Dq1YxucNDbrO8L2l8uV1SEOKuL4oVhUjlDeRLrg82Wo=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.13.0-rc.95/nuget.frameworks.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.LibraryModel",
"version": "6.11.0-rc.110",
"hash": "sha256-PYiEmV44XWUCK7Wahs8ZQ8GHcL4yO+fT+Y1OQHna68E=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.11.0-rc.110/nuget.librarymodel.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-zuiuiT6NprcW/UEhndi6vO4J3ONeIGkmRMjkDqdf4QQ=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.13.0-rc.95/nuget.librarymodel.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.Packaging",
"version": "6.11.0-rc.110",
"hash": "sha256-pnGx4JWJ02X18Qko5TX1DTbbbQj1msdKb0Lrphzyjps=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.11.0-rc.110/nuget.packaging.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-gK0UtXawa2HtdYyug/vTihrj4ZLqCJ8w516kj9Gmq40=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.13.0-rc.95/nuget.packaging.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.ProjectModel",
"version": "6.11.0-rc.110",
"hash": "sha256-xE1Us1qn3qAbLS/1rdZMWfl5tEO5pCQGp+P+VUrLBOQ=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.11.0-rc.110/nuget.projectmodel.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-Y+3CNqRfoCTzVYgVpJ8Q2kIQcZIbdfit6uVOuqFaMy0=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.13.0-rc.95/nuget.projectmodel.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.Protocol",
"version": "6.11.0-rc.110",
"hash": "sha256-XS8HsEDPoEjBNbfdo1c+PHB6BUOs8IpdfXvkmDsSZD4=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.11.0-rc.110/nuget.protocol.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-HyzaY1PmpPGG6J8g+BYdS1ETYZMwahEu7OiyWyjXzu4=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.13.0-rc.95/nuget.protocol.6.13.0-rc.95.nupkg"
},
{
"pname": "NuGet.Versioning",
"version": "6.11.0-rc.110",
"hash": "sha256-eyhOSwBFquzExUis+zGgP5gCO/nVSY5IzXcWeeVz/Ww=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.11.0-rc.110/nuget.versioning.6.11.0-rc.110.nupkg"
"version": "6.13.0-rc.95",
"hash": "sha256-2em8SYwrFR7wDjBpoSDs3Gfdz7w90IUs8vnGCnxcgF8=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.13.0-rc.95/nuget.versioning.6.13.0-rc.95.nupkg"
},
{
"pname": "OmniSharp.Extensions.JsonRpc",
@@ -559,6 +564,11 @@
"version": "8.0.0",
"hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "8.0.1",
"hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
},
{
"pname": "System.Diagnostics.EventLog",
"version": "8.0.0",
@@ -574,6 +584,11 @@
"version": "6.0.0",
"hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
},
{
"pname": "System.Formats.Asn1",
"version": "8.0.1",
"hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
},
{
"pname": "System.IO.Pipelines",
"version": "7.0.0",
@@ -701,8 +716,8 @@
},
{
"pname": "System.Text.Json",
"version": "8.0.4",
"hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="
"version": "8.0.5",
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
},
{
"pname": "System.Threading.Channels",
+47 -44
View File
@@ -1,8 +1,8 @@
{
buildDotnetModule,
dotnetCorePackages,
fetchFromGitHub,
lib,
dotnetCorePackages,
buildDotnetModule,
fetchFromGitHub,
runCommand,
expect,
}:
@@ -13,13 +13,13 @@ in
let
finalPackage = buildDotnetModule rec {
pname = "omnisharp-roslyn";
version = "1.39.12";
version = "1.39.13";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-roslyn";
rev = "refs/tags/v${version}";
hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
tag = "v${version}";
hash = "sha256-/U7zpx0jAnvZl7tshGV7wORD/wQUKYgX1kADpyCXHM4=";
};
projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
@@ -60,49 +60,52 @@ let
useDotnetFromEnv = true;
executables = [ "OmniSharp" ];
passthru.tests =
let
with-sdk =
sdk:
runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
{
nativeBuildInputs = [
finalPackage
sdk
expect
];
meta.timeout = 60;
}
''
HOME=$TMPDIR
expect <<"EOF"
spawn OmniSharp
expect_before timeout {
send_error "timeout!\n"
exit 1
}
expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
expect "{\"Event\":\"started\","
send \x03
expect eof
catch wait result
exit [lindex $result 3]
EOF
touch $out
'';
in
{
# Make sure we can run OmniSharp with any supported SDK version, as well as without
with-net8-sdk = with-sdk sdk_8_0;
with-net9-sdk = with-sdk sdk_9_0;
no-sdk = with-sdk null;
};
passthru = {
tests =
let
with-sdk =
sdk:
runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
{
nativeBuildInputs = [
finalPackage
sdk
expect
];
meta.timeout = 60;
}
''
HOME=$TMPDIR
expect <<"EOF"
spawn OmniSharp
expect_before timeout {
send_error "timeout!\n"
exit 1
}
expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
expect "{\"Event\":\"started\","
send \x03
expect eof
catch wait result
exit [lindex $result 3]
EOF
touch $out
'';
in
{
# Make sure we can run OmniSharp with any supported SDK version, as well as without
with-net8-sdk = with-sdk sdk_8_0;
with-net9-sdk = with-sdk sdk_9_0;
no-sdk = with-sdk null;
};
passthru.updateScript = ./update.sh;
updateScript = ./update.sh;
};
meta = {
description = "OmniSharp based on roslyn workspaces";
homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
changelog = "https://github.com/OmniSharp/omnisharp-roslyn/blob/v${version}/CHANGELOG.md";
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryNativeCode # dependencies
+11 -1
View File
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
popd
'';
configureFlags = [ "--localstatedir=/var" ];
configureFlags = [
"--localstatedir=/var"
"--with-dbdir=/var/lib/ovn"
"--enable-ssl"
];
enableParallelBuilding = true;
@@ -66,7 +70,13 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -vp $out/share/openvswitch/scripts
mkdir -vp $out/etc/ovn
cp ovs/utilities/ovs-appctl $out/share/openvswitch/scripts
cp ovs/utilities/ovs-vsctl $out/share/openvswitch/scripts
cp ovs/utilities/ovs-lib $out/share/openvswitch/scripts
sed -i "s#/usr/local/bin#$out/share/openvswitch/scripts#g" $out/share/openvswitch/scripts/ovs-lib
sed -i "s#/usr/local/sbin#$out/share/openvswitch/scripts#g" $out/share/openvswitch/scripts/ovs-lib
sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl
'';
# https://docs.ovn.org/en/latest/topics/testing.html
+47
View File
@@ -0,0 +1,47 @@
{
lib,
rustPlatform,
fetchFromSourcehut,
pkg-config,
sqlite,
scdoc,
makeWrapper,
}:
rustPlatform.buildRustPackage rec {
pname = "pimsync";
version = "0.1.0";
src = fetchFromSourcehut {
owner = "~whynothugo";
repo = "pimsync";
rev = "v${version}";
hash = "sha256-upOCrpbveSSFrhdHDkTOmja4MLmsgtuoDHMsgXyulWI=";
};
cargoHash = "sha256-QRgyHzIjdI8+OzvM+3sfuxTNMVCdGxrMvQpCnot9iUM=";
nativeBuildInputs = [
pkg-config
scdoc
makeWrapper
];
buildInputs = [
sqlite
];
makeFlags = [
"build"
"PREFIX=${placeholder "out"}"
];
meta = {
description = "Synchronise calendars and contacts";
homepage = "https://git.sr.ht/~whynothugo/pimsync";
license = lib.licenses.eupl12;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.qxrein ];
mainProgram = "pimsync";
};
}
+3 -3
View File
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "rattler-build";
version = "0.32.1";
version = "0.33.1";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "rattler-build";
rev = "refs/tags/v${version}";
hash = "sha256-jVYck9UCeOJlRaQsdk3GTPZLYZbRjoDH4NbEdwNr6mM=";
hash = "sha256-yceScRfZuMVnNVNVg3Xs+jU3spdFn0hPMmwMLaYzkNE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-8TK5xtKAMv5QCbq+he/ptnQf+pbrR5UfNb76qTh99+c=";
cargoHash = "sha256-eJH7a+9asSPDv0gBwvLc4zssJGCY2jAfVKKOWb3oQ/Q=";
doCheck = false; # test requires network access
+2 -2
View File
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "rocksndiamonds";
version = "4.3.8.2";
version = "4.4.0.0";
src = fetchurl {
url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz";
hash = "sha256-e/aYjjnEM6MP14FGX+N92U9fRNEjIaDfE1znl6A+4As=";
hash = "sha256-aKHHD/v+zqxCsOYp06nqB2TShlwCwE1JaU0adO4T4Cw=";
};
desktopItem = makeDesktopItem {
+3 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "snowflake-cli";
version = "3.1.0";
version = "3.2.2";
pyproject = true;
src = fetchFromGitHub {
owner = "snowflakedb";
repo = "snowflake-cli";
rev = "refs/tags/v${version}";
hash = "sha256-/n11GbrgFwjiAuwpFNJ3T96VDhdOy2x+hesgh4oPVbo=";
hash = "sha256-1AXp2bCBNuYwnyQMIQn3uLLKdWVznBRK6HcB/E7Yjo8=";
};
build-system = with python3Packages; [
@@ -65,6 +65,7 @@ python3Packages.buildPythonApplication rec {
"test_snow_typer_help_sanitization" # Snapshot needs update?
"test_help_message" # Snapshot needs update?
"test_executing_command_sends_telemetry_usage_data" # Fails on mocked version
"test_generate_jwt_with_passphrase" # Fails, upstream PR https://github.com/snowflakedb/snowflake-cli/pull/1898
];
pythonRelaxDeps = true;
+73 -99
View File
@@ -20,37 +20,73 @@
webkitgtk_4_1,
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "spotube";
version = "3.9.0";
meta = {
description = "Open source, cross-platform Spotify client compatible across multiple platforms";
longDescription = ''
Spotube is an open source, cross-platform Spotify client compatible across
multiple platforms utilizing Spotify's data API and YouTube (or Piped.video or JioSaavn)
as an audio source, eliminating the need for Spotify Premium
'';
downloadPage = "https://github.com/KRTirtho/spotube/releases";
homepage = "https://spotube.krtirtho.dev/";
license = lib.licenses.bsdOriginal;
mainProgram = "spotube";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
"aarch64-linux"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
sources =
sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin ".";
nativeBuildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
autoPatchelfHook
dpkg
makeWrapper
wrapGAppsHook3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
undmg
makeBinaryWrapper
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
gtk3
libappindicator
libnotify
libsoup_3
mpv-unwrapped
webkitgtk_4_1
];
dontWrapGApps = true;
installPhase = ''
runHook preInstall
${lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir -p $out
cp -r usr/* $out
''}
${lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r Spotube.app $out/Applications
makeBinaryWrapper $out/Applications/Spotube.app/Contents/MacOS/Spotube $out/bin/spotube
''}
runHook postInstall
'';
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf $out/share/spotube/lib/libmedia_kit_native_event_loop.so \
--replace-needed libmpv.so.1 libmpv.so
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
makeWrapper $out/share/spotube/spotube $out/bin/spotube \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : $out/share/spotube/lib:${lib.makeLibraryPath [ mpv-unwrapped ]} \
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
passthru.sources =
let
fetchArtifact =
{ filename, hash }:
fetchurl {
url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}";
url = "https://github.com/KRTirtho/spotube/releases/download/v${finalAttrs.version}/${filename}";
inherit hash;
};
in
@@ -73,81 +109,19 @@ let
};
};
src = sources.${stdenv.hostPlatform.system};
darwin = stdenv.mkDerivation {
inherit
pname
version
meta
src
;
passthru = { inherit sources; };
sourceRoot = ".";
nativeBuildInputs = [
undmg
makeBinaryWrapper
];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications $out/bin
cp -r spotube.app $out/Applications
makeBinaryWrapper $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
runHook postInstall
meta = {
description = "Open source, cross-platform Spotify client compatible across multiple platforms";
longDescription = ''
Spotube is an open source, cross-platform Spotify client compatible across
multiple platforms utilizing Spotify's data API and YouTube (or Piped.video or JioSaavn)
as an audio source, eliminating the need for Spotify Premium
'';
downloadPage = "https://github.com/KRTirtho/spotube/releases";
homepage = "https://spotube.krtirtho.dev/";
license = lib.licenses.bsdOriginal;
mainProgram = "spotube";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.attrNames finalAttrs.passthru.sources;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
linux = stdenv.mkDerivation {
inherit
pname
version
meta
src
;
passthru = { inherit sources; };
nativeBuildInputs = [
autoPatchelfHook
dpkg
makeWrapper
wrapGAppsHook3
];
buildInputs = [
glib-networking
gtk3
libappindicator
libnotify
libsoup_3
mpv-unwrapped
webkitgtk_4_1
];
dontWrapGApps = true;
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r usr/* $out
runHook postInstall
'';
preFixup = ''
patchelf $out/share/spotube/lib/libmedia_kit_native_event_loop.so \
--replace-needed libmpv.so.1 libmpv.so
'';
postFixup = ''
makeWrapper $out/share/spotube/spotube $out/bin/spotube \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : $out/share/spotube/lib:${lib.makeLibraryPath [ mpv-unwrapped ]} \
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
};
in
if stdenv.hostPlatform.isDarwin then darwin else linux
})
+3 -3
View File
@@ -40,13 +40,13 @@ stdenv.mkDerivation {
pname = binName;
# versions are specified in `squeezelite.h`
# see https://github.com/ralph-irving/squeezelite/issues/29
version = "2.0.0.1507";
version = "2.0.0.1517";
src = fetchFromGitHub {
owner = "ralph-irving";
repo = "squeezelite";
rev = "279ac086053239323f5c4df965342e3be5d10671";
hash = "sha256-iMqBQJDy1pkGNHH2aFOtzBn9VK5x+Na4iD2vc3bppTc=";
rev = "262994a989dc29ce3be4390c57c6a43373dfdca2";
hash = "sha256-QmjjVbE5lQhKMt2Loq7wPV16phcEUUcdiNGdmImkoAI=";
};
buildInputs =
@@ -2,7 +2,6 @@
lib,
rustPlatform,
fetchFromGitHub,
fetchpatch,
stdenv,
darwin,
nixosTests,
@@ -10,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "static-web-server";
version = "2.33.1";
version = "2.34.0";
src = fetchFromGitHub {
owner = "static-web-server";
repo = pname;
rev = "v${version}";
hash = "sha256-2vkRLQ4FKw/gkv4GuwFVcL8oDV4cNuKualQVc/X2B/Y=";
hash = "sha256-rHY1UVLAojGEbVdTRNshvcvxI4pYaU2nRUkmYWSTvvw=";
};
cargoHash = "sha256-wRDYzm6mYze9CX+Ug53M3wuf3Ry6l3NGTDyCL7rbdc8=";
cargoHash = "sha256-lT+rwKXqFnFIxjD9DQQf1GY9pqrkUIT7PEsH4i8DM+g=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
@@ -45,7 +44,10 @@ rustPlatform.buildRustPackage rec {
mit # or
asl20
];
maintainers = with maintainers; [ figsoda ];
maintainers = with maintainers; [
figsoda
misilelab
];
mainProgram = "static-web-server";
};
}
+249 -72
View File
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4
[[package]]
name = "addr2line"
@@ -41,7 +41,7 @@ dependencies = [
[[package]]
name = "aim-downloader"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"async-stream",
"clap",
@@ -201,7 +201,7 @@ dependencies = [
"rand 0.8.5",
"reqwest",
"reqwest-eventsource",
"secrecy",
"secrecy 0.8.0",
"serde",
"serde_json",
"thiserror",
@@ -308,7 +308,7 @@ dependencies = [
"sync_wrapper 1.0.1",
"tokio",
"tokio-tungstenite",
"tower",
"tower 0.4.13",
"tower-layer",
"tower-service",
"tracing",
@@ -352,7 +352,7 @@ dependencies = [
"mime",
"pin-project-lite",
"serde",
"tower",
"tower 0.4.13",
"tower-layer",
"tower-service",
"tracing",
@@ -376,8 +376,8 @@ dependencies = [
"once_cell",
"pin-project",
"tokio",
"tower",
"tower-http",
"tower 0.4.13",
"tower-http 0.5.2",
]
[[package]]
@@ -444,9 +444,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
dependencies = [
"serde",
]
@@ -637,6 +637,17 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
[[package]]
name = "clocksource"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "129026dd5a8a9592d96916258f3a5379589e513ea5e86aeb0bd2530286e44e9e"
dependencies = [
"libc",
"time",
"winapi",
]
[[package]]
name = "cmake"
version = "0.1.50"
@@ -728,10 +739,20 @@ dependencies = [
]
[[package]]
name = "core-foundation-sys"
version = "0.8.6"
name = "core-foundation"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cpufeatures"
@@ -1291,6 +1312,16 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "fslock"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "futf"
version = "0.1.5"
@@ -1475,7 +1506,7 @@ version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"libc",
"libgit2-sys",
"log",
@@ -1691,7 +1722,7 @@ dependencies = [
[[package]]
name = "hash-ids"
version = "0.20.0"
version = "0.22.0"
[[package]]
name = "hashbrown"
@@ -1875,13 +1906,14 @@ dependencies = [
[[package]]
name = "http-api-bindings"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-openai",
"async-stream",
"async-trait",
"futures",
"leaky-bucket",
"ollama-api-bindings",
"reqwest",
"reqwest-eventsource",
@@ -1890,6 +1922,7 @@ dependencies = [
"tabby-common",
"tabby-inference",
"tokio",
"tracing",
]
[[package]]
@@ -1998,12 +2031,29 @@ dependencies = [
"http 1.1.0",
"hyper 1.3.1",
"hyper-util",
"log",
"rustls",
"rustls-native-certs",
"rustls 0.22.4",
"rustls-pki-types",
"tokio",
"tokio-rustls",
"tokio-rustls 0.25.0",
"tower-service",
]
[[package]]
name = "hyper-rustls"
version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http 1.1.0",
"hyper 1.3.1",
"hyper-util",
"log",
"rustls 0.23.20",
"rustls-native-certs 0.8.1",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.26.1",
"tower-service",
]
@@ -2051,7 +2101,7 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio",
"tower",
"tower 0.4.13",
"tower-service",
"tracing",
]
@@ -2353,6 +2403,17 @@ dependencies = [
"spin 0.5.2",
]
[[package]]
name = "leaky-bucket"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a396bb213c2d09ed6c5495fd082c991b6ab39c9daf4fff59e6727f85c73e4c5"
dependencies = [
"parking_lot",
"pin-project-lite",
"tokio",
]
[[package]]
name = "lettre"
version = "0.11.7"
@@ -2538,7 +2599,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "llama-cpp-server"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-openai",
@@ -2832,7 +2893,7 @@ dependencies = [
"openssl-probe",
"openssl-sys",
"schannel",
"security-framework",
"security-framework 2.11.0",
"security-framework-sys",
"tempfile",
]
@@ -3027,9 +3088,9 @@ dependencies = [
[[package]]
name = "octocrab"
version = "0.38.0"
version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68a8a3df00728324ad654ecd1ed449a60157c55b7ff8c109af3a35989687c367"
checksum = "7b97f949a7cb04608441c2ddb28e15a377e8b5142c2d1835ad2686d434de8558"
dependencies = [
"arc-swap",
"async-trait",
@@ -3044,29 +3105,30 @@ dependencies = [
"http-body 1.0.0",
"http-body-util",
"hyper 1.3.1",
"hyper-rustls",
"hyper-rustls 0.27.3",
"hyper-timeout",
"hyper-util",
"jsonwebtoken",
"once_cell",
"percent-encoding",
"pin-project",
"secrecy",
"secrecy 0.10.3",
"serde",
"serde_json",
"serde_path_to_error",
"serde_urlencoded",
"snafu",
"tokio",
"tower",
"tower-http",
"tower 0.5.2",
"tower-http 0.6.2",
"tracing",
"url",
"web-time",
]
[[package]]
name = "ollama-api-bindings"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-stream",
@@ -3123,7 +3185,7 @@ version = "0.10.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"cfg-if",
"foreign-types",
"libc",
@@ -3729,13 +3791,24 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "ratelimit"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36ea961700fd7260e7fa3701c8287d901b2172c51f9c1421fa0f21d7f7e184b7"
dependencies = [
"clocksource",
"parking_lot",
"thiserror",
]
[[package]]
name = "raw-cpuid"
version = "11.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
]
[[package]]
@@ -3787,7 +3860,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
]
[[package]]
@@ -3871,7 +3944,7 @@ dependencies = [
"http-body 1.0.0",
"http-body-util",
"hyper 1.3.1",
"hyper-rustls",
"hyper-rustls 0.26.0",
"hyper-tls",
"hyper-util",
"ipnet",
@@ -3883,8 +3956,8 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
"rustls",
"rustls-native-certs",
"rustls 0.22.4",
"rustls-native-certs 0.7.0",
"rustls-pemfile",
"rustls-pki-types",
"serde",
@@ -3894,7 +3967,7 @@ dependencies = [
"system-configuration",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tokio-rustls 0.25.0",
"tokio-util",
"tower-service",
"url",
@@ -4050,7 +4123,7 @@ version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys",
@@ -4071,6 +4144,21 @@ dependencies = [
"zeroize",
]
[[package]]
name = "rustls"
version = "0.23.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
dependencies = [
"log",
"once_cell",
"ring",
"rustls-pki-types",
"rustls-webpki",
"subtle",
"zeroize",
]
[[package]]
name = "rustls-native-certs"
version = "0.7.0"
@@ -4081,7 +4169,19 @@ dependencies = [
"rustls-pemfile",
"rustls-pki-types",
"schannel",
"security-framework",
"security-framework 2.11.0",
]
[[package]]
name = "rustls-native-certs"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
dependencies = [
"openssl-probe",
"rustls-pki-types",
"schannel",
"security-framework 3.0.1",
]
[[package]]
@@ -4096,15 +4196,15 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
version = "1.7.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
[[package]]
name = "rustls-webpki"
version = "0.102.4"
version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -4178,14 +4278,36 @@ dependencies = [
"zeroize",
]
[[package]]
name = "secrecy"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a"
dependencies = [
"zeroize",
]
[[package]]
name = "security-framework"
version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
dependencies = [
"bitflags 2.5.0",
"core-foundation",
"bitflags 2.6.0",
"core-foundation 0.9.4",
"core-foundation-sys",
"libc",
"security-framework-sys",
]
[[package]]
name = "security-framework"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8"
dependencies = [
"bitflags 2.6.0",
"core-foundation 0.10.0",
"core-foundation-sys",
"libc",
"security-framework-sys",
@@ -4193,9 +4315,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
version = "2.11.0"
version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
dependencies = [
"core-foundation-sys",
"libc",
@@ -4332,6 +4454,7 @@ version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d"
dependencies = [
"fslock",
"futures",
"log",
"once_cell",
@@ -4682,7 +4805,7 @@ source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a
dependencies = [
"atoi",
"base64 0.21.7",
"bitflags 2.5.0",
"bitflags 2.6.0",
"byteorder",
"bytes",
"chrono",
@@ -4724,7 +4847,7 @@ source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a
dependencies = [
"atoi",
"base64 0.21.7",
"bitflags 2.5.0",
"bitflags 2.6.0",
"byteorder",
"chrono",
"crc",
@@ -4964,7 +5087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
"core-foundation 0.9.4",
"system-configuration-sys",
]
@@ -4980,7 +5103,7 @@ dependencies = [
[[package]]
name = "tabby"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"assert-json-diff",
@@ -5020,7 +5143,7 @@ dependencies = [
"tantivy",
"thiserror",
"tokio",
"tower-http",
"tower-http 0.5.2",
"tracing",
"tracing-subscriber",
"utoipa",
@@ -5031,7 +5154,7 @@ dependencies = [
[[package]]
name = "tabby-common"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-trait",
@@ -5059,7 +5182,7 @@ dependencies = [
[[package]]
name = "tabby-crawler"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-stream",
@@ -5078,7 +5201,7 @@ dependencies = [
[[package]]
name = "tabby-db"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"assert_matches",
@@ -5096,7 +5219,7 @@ dependencies = [
[[package]]
name = "tabby-db-macros"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"quote",
"syn 2.0.66",
@@ -5104,7 +5227,7 @@ dependencies = [
[[package]]
name = "tabby-download"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"aim-downloader",
"anyhow",
@@ -5116,7 +5239,7 @@ dependencies = [
[[package]]
name = "tabby-git"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"assert_matches",
@@ -5137,7 +5260,7 @@ dependencies = [
[[package]]
name = "tabby-index"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-stream",
@@ -5179,7 +5302,7 @@ dependencies = [
[[package]]
name = "tabby-index-cli"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"clap",
@@ -5191,7 +5314,7 @@ dependencies = [
[[package]]
name = "tabby-inference"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-openai",
@@ -5201,7 +5324,7 @@ dependencies = [
"derive_builder",
"futures",
"reqwest",
"secrecy",
"secrecy 0.8.0",
"tabby-common",
"tracing",
"trie-rs",
@@ -5209,7 +5332,7 @@ dependencies = [
[[package]]
name = "tabby-schema"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"async-openai",
@@ -5236,7 +5359,7 @@ dependencies = [
[[package]]
name = "tabby-webserver"
version = "0.20.0"
version = "0.22.0"
dependencies = [
"anyhow",
"argon2",
@@ -5247,6 +5370,7 @@ dependencies = [
"axum",
"axum-extra",
"bincode",
"cached",
"chrono",
"cron",
"fs_extra",
@@ -5265,6 +5389,7 @@ dependencies = [
"octocrab",
"pin-project",
"querystring",
"ratelimit",
"reqwest",
"rust-embed",
"serde",
@@ -5653,11 +5778,21 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
dependencies = [
"rustls",
"rustls 0.22.4",
"rustls-pki-types",
"tokio",
]
[[package]]
name = "tokio-rustls"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
dependencies = [
"rustls 0.23.20",
"tokio",
]
[[package]]
name = "tokio-serde"
version = "0.8.0"
@@ -5755,6 +5890,22 @@ dependencies = [
"pin-project",
"pin-project-lite",
"tokio",
"tower-layer",
"tower-service",
"tracing",
]
[[package]]
name = "tower"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
dependencies = [
"futures-core",
"futures-util",
"pin-project-lite",
"sync_wrapper 1.0.1",
"tokio",
"tokio-util",
"tower-layer",
"tower-service",
@@ -5767,16 +5918,31 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"bytes",
"http 1.1.0",
"http-body 1.0.0",
"http-body-util",
"pin-project-lite",
"tokio",
"tower-layer",
"tower-service",
]
[[package]]
name = "tower-http"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
dependencies = [
"bitflags 2.6.0",
"bytes",
"futures-util",
"http 1.1.0",
"http-body 1.0.0",
"http-body-util",
"iri-string",
"pin-project-lite",
"tokio",
"tower",
"tower 0.5.2",
"tower-layer",
"tower-service",
"tracing",
@@ -5784,15 +5950,15 @@ dependencies = [
[[package]]
name = "tower-layer"
version = "0.3.2"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
[[package]]
name = "tower-service"
version = "0.3.2"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
@@ -6498,6 +6664,17 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "web-time"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
dependencies = [
"js-sys",
"serde",
"wasm-bindgen",
]
[[package]]
name = "webpki-roots"
version = "0.26.3"
+2 -2
View File
@@ -31,7 +31,7 @@ let
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
pname = "tabby";
version = "0.20.0";
version = "0.22.0";
availableAccelerations = flatten [
(optional cudaSupport "cuda")
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage {
owner = "TabbyML";
repo = "tabby";
rev = "refs/tags/v${version}";
hash = "sha256-Vhl5oNVYY3pizoA0PuV4c9UXH3F2L+WiXQMOM0Pqxks=";
hash = "sha256-fzbJjoBJ6zOw1ABN9PitbW2usm4NgqVfMWSAvRAVHj0=";
fetchSubmodules = true;
};
+18 -1
View File
@@ -1,11 +1,14 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
installShellFiles,
pkg-config,
libgit2,
openssl,
zlib,
buildPackages,
versionCheckHook,
nix-update-script,
vscode-extensions,
@@ -27,7 +30,10 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-+Ce9qIETGFZXG4RX5GP8tpmH4fkpbPkDS1FX64NQ6/4=";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = [
libgit2
@@ -59,6 +65,17 @@ rustPlatform.buildRustPackage rec {
"--skip=semantic_tokens_full::tests::test"
];
postInstall =
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
''
installShellCompletion --cmd tinymist \
--bash <(${emulator} $out/bin/tinymist completion bash) \
--fish <(${emulator} $out/bin/tinymist completion fish) \
--zsh <(${emulator} $out/bin/tinymist completion zsh)
'';
nativeInstallCheckInputs = [
versionCheckHook
];
+53
View File
@@ -0,0 +1,53 @@
diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp
index e86aae8460..a4dca23770 100644
--- a/src/core/debugger/debugger.cpp
+++ b/src/core/debugger/debugger.cpp
@@ -5,7 +5,13 @@
#include <mutex>
#include <thread>
-#include <boost/asio.hpp>
+// Use basic asio functionality only
+#define BOOST_ASIO_STANDALONE
+#include <boost/asio/basic_io_object.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/write.hpp>
+#include <boost/asio/read.hpp>
+
#include <boost/process/async_pipe.hpp>
#include "common/logging/log.h"
@@ -21,17 +27,22 @@
template <typename Readable, typename Buffer, typename Callback>
static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) {
- static_assert(std::is_trivial_v<Buffer>);
- auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))};
- r.async_read_some(
- boost_buffer, [&, c](const boost::system::error_code& error, size_t bytes_read) {
- if (!error.failed()) {
- const u8* buffer_start = reinterpret_cast<const u8*>(&buffer);
- std::span<const u8> received_data{buffer_start, buffer_start + bytes_read};
- c(received_data);
- AsyncReceiveInto(r, buffer, c);
- }
- });
+ try {
+ static_assert(std::is_trivial_v<Buffer>);
+ auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))};
+ r.async_read_some(
+ boost_buffer,
+ [&, c](const boost::system::error_code& error, size_t bytes_read) {
+ if (!error) {
+ const u8* buffer_start = reinterpret_cast<const u8*>(&buffer);
+ std::span<const u8> received_data{buffer_start, buffer_start + bytes_read};
+ c(received_data);
+ AsyncReceiveInto(r, buffer, c);
+ }
+ });
+ } catch (const std::exception& e) {
+ LOG_ERROR(Debug_GDBStub, "AsyncReceiveInto error: {}", e.what());
+ }
}
template <typename Callback>
@@ -0,0 +1,30 @@
diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp
index 60821b31a6..8f9c047218 100644
--- a/src/input_common/drivers/udp_client.cpp
+++ b/src/input_common/drivers/udp_client.cpp
@@ -2,7 +2,15 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <random>
-#include <boost/asio.hpp>
+// Include only needed asio components
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/udp.hpp>
+#include <boost/asio/basic_waitable_timer.hpp>
+#include <boost/asio/write.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/basic_socket.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/address_v4.hpp>
#include <fmt/format.h>
#include "common/logging/log.h"
@@ -113,7 +121,7 @@ private:
}
SocketCallback callback;
- boost::asio::io_service io_service;
+ boost::asio::io_context io_service;
boost::asio::basic_waitable_timer<clock> timer;
udp::socket socket;
@@ -0,0 +1,13 @@
diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h
index db08fc62c5..ea223ea937 100644
--- a/src/input_common/helpers/udp_protocol.h
+++ b/src/input_common/helpers/udp_protocol.h
@@ -69,7 +69,7 @@ Message<T> CreateMessage(const u32 magic, const T data, const u32 sender_id) {
};
Message<T> message{header, data};
crc.process_bytes(&message, sizeof(Message<T>));
- message.header.crc = crc.checksum();
+ message.header.crc = static_cast<u32_le>(crc.checksum());
return message;
}
+244
View File
@@ -0,0 +1,244 @@
{
lib,
stdenv,
SDL2,
autoconf,
boost,
catch2_3,
cmake,
fetchFromGitHub,
cpp-jwt,
cubeb,
discord-rpc,
enet,
fetchgit,
fetchurl,
ffmpeg-headless,
fmt,
glslang,
libopus,
libusb1,
libva,
lz4,
python3,
unzip,
nix-update-script,
nlohmann_json,
nv-codec-headers-12,
pkg-config,
qt6,
vulkan-headers,
vulkan-loader,
yasm,
simpleini,
zlib,
vulkan-memory-allocator,
zstd,
}:
let
inherit (qt6)
qtbase
qtmultimedia
qtwayland
wrapQtAppsHook
qttools
qtwebengine
;
compat-list = stdenv.mkDerivation {
pname = "yuzu-compatibility-list";
version = "unstable-2024-02-26";
src = fetchFromGitHub {
owner = "flathub";
repo = "org.yuzu_emu.yuzu";
rev = "9c2032a3c7e64772a8112b77ed8b660242172068";
hash = "sha256-ITh/W4vfC9w9t+TJnPeTZwWifnhTNKX54JSSdpgaoBk=";
};
buildCommand = ''
cp $src/compatibility_list.json $out
'';
};
nx_tzdb = stdenv.mkDerivation rec {
pname = "nx_tzdb";
version = "221202";
src = fetchurl {
url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${version}/${version}.zip";
hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c=";
};
nativeBuildInputs = [ unzip ];
buildCommand = ''
unzip $src -d $out
'';
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "torzu";
version = "unstable-2024-12-15";
src = fetchgit {
url = "https://notabug.org/litucks/torzu";
rev = "02cfee3f184e6fdcc3b483ef399fb5d2bb1e8ec7";
hash = "sha256-hAWMFzTNJGFcrXov5LKMdW9YWhsu7wueATmiuS7EVkI=";
fetchSubmodules = true;
};
patches = [
# Remove coroutines from debugger to fix boost::asio compatibility issues
./fix-debugger.patch
# Add explicit cast for CRC checksum value
./fix-udp-protocol.patch
# Use specific boost::asio includes and update to modern io_context
./fix-udp-client.patch
];
nativeBuildInputs = [
cmake
glslang
pkg-config
python3
qttools
wrapQtAppsHook
];
buildInputs = [
# vulkan-headers must come first, so the older propagated versions
# don't get picked up by accident
vulkan-headers
boost
catch2_3
cpp-jwt
cubeb
discord-rpc
# intentionally omitted: dynarmic - prefer vendored version for compatibility
enet
# ffmpeg deps (also includes vendored)
# we do not use internal ffmpeg because cuda errors
autoconf
yasm
libva # for accelerated video decode on non-nvidia
nv-codec-headers-12 # for accelerated video decode on nvidia
ffmpeg-headless
# end ffmpeg deps
fmt
# intentionally omitted: gamemode - loaded dynamically at runtime
# intentionally omitted: httplib - upstream requires an older version than what we have
libopus
libusb1
# intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
lz4
nlohmann_json
qtbase
qtmultimedia
qtwayland
qtwebengine
# intentionally omitted: renderdoc - heavy, developer only
SDL2
# intentionally omitted: stb - header only libraries, vendor uses git snapshot
vulkan-memory-allocator
# intentionally omitted: xbyak - prefer vendored version for compatibility
zlib
zstd
];
# This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
# making the build fail, as that path does not exist
dontFixCmake = true;
cmakeFlags = [
# actually has a noticeable performance impact
(lib.cmakeBool "YUZU_ENABLE_LTO" true)
(lib.cmakeBool "YUZU_TESTS" false)
(lib.cmakeBool "ENABLE_QT6" true)
(lib.cmakeBool "ENABLE_QT_TRANSLATION" true)
# use system libraries
# NB: "external" here means "from the externals/ directory in the source",
# so "off" means "use system"
(lib.cmakeBool "YUZU_USE_EXTERNAL_SDL2" false)
(lib.cmakeBool "YUZU_USE_EXTERNAL_VULKAN_HEADERS" true)
"-DVulkan_INCLUDE_DIRS=${vulkan-headers}/include"
# # don't use system ffmpeg, suyu uses internal APIs
# (lib.cmakeBool "YUZU_USE_BUNDLED_FFMPEG" true)
# don't check for missing submodules
(lib.cmakeBool "YUZU_CHECK_SUBMODULES" false)
# enable some optional features
(lib.cmakeBool "YUZU_USE_QT_WEB_ENGINE" true)
(lib.cmakeBool "YUZU_USE_QT_MULTIMEDIA" true)
(lib.cmakeBool "USE_DISCORD_PRESENCE" true)
# We dont want to bother upstream with potentially outdated compat reports
(lib.cmakeBool "YUZU_ENABLE_COMPATIBILITY_REPORTING" false)
(lib.cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) # We provide this deterministically
];
env = {
# Does some handrolled SIMD
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1";
};
qtWrapperArgs = [
# Fixes vulkan detection.
# FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
];
# Setting this through cmakeFlags does not work.
# https://github.com/NixOS/nixpkgs/issues/114044
preConfigure = lib.concatStringsSep "\n" [
''
cmakeFlagsArray+=(
"-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}"
"-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}"
)
''
# provide pre-downloaded tz data
''
mkdir -p build/externals/nx_tzdb
ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb
''
];
postConfigure = ''
ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json
'';
postInstall = "
install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules
";
meta = {
description = "Fork of yuzu, an open-source Nintendo Switch emulator";
homepage = "https://notabug.org/litucks/torzu";
mainProgram = "yuzu";
platforms = lib.platforms.linux;
badPlatforms = [
# Several conversion errors, probably caused by the update to GCC 14
"aarch64-linux"
];
maintainers = with lib.maintainers; [ liberodark ];
license = with lib.licenses; [
gpl3Plus
# Icons
asl20
mit
cc0
];
};
})
+2 -2
View File
@@ -9,7 +9,7 @@
let
pname = "trezor-suite";
version = "24.11.3";
version = "24.12.3";
suffix =
{
@@ -24,7 +24,7 @@ let
{
# curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-erNWQTaj/WWoqy3TO7wb+ijQkwXjqfCjqvQN6/9gCVjbHswURWHX36P0rJg9vuQu6odi5EKtooDusIxjIUkQzA==";
x86_64-linux = "sha512-BorpJI0Vi6fFRGo2lATcuBiI1vTLY8vfmnUXKckJkMCBiurs/ZR08ZxKPOTaoS61BzSanUCRwcovev294bcqkA==";
x86_64-linux = "sha512-Zd+Ou3YUymlKr5lOTdWEZVdCbz3cIJx3Ho65AGDUXkNXfOrCc0v9faE8Np/9TkpJDWWqjjUoTJkkvsbapiMOOQ==";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
+3 -3
View File
@@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec {
pname = "trippy";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "fujiapple852";
repo = "trippy";
rev = version;
hash = "sha256-0JV8Lvl8j1PWvhVnAs8YXwV5b0LWpHPKQpeGL/NetnQ=";
hash = "sha256-Kn694KUCl2fYl8BkYUgRPxNx9LW/IVOsmA5mE9cS/nQ=";
};
nativeBuildInputs = [ installShellFiles ];
cargoHash = "sha256-0+Vq6I9m4YWfrdtWBlbhCwxsLnavDsNpMHVIide6aPY=";
cargoHash = "sha256-+lvh2HHW2yAI8rT07yCz4hL+ESXnjKXsskbgTvFPJZQ=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
local INSTALL="$out/bin/trip"
+2 -2
View File
@@ -7,11 +7,11 @@
appimageTools.wrapType2 rec {
pname = "tutanota-desktop";
version = "253.241203.1";
version = "259.241223.0";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
hash = "sha256-UtryT5nd8zZQ4Bz3BBes4eL/AchEoIVE6BZ5ZHG/874=";
hash = "sha256-PfgdYKy3JfId04hu8qrNhmdpwOmyfsfz7Bk7KpLTdzk=";
};
extraPkgs = pkgs: [ pkgs.libsecret ];
+3 -3
View File
@@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "typescript";
version = "5.6.3";
version = "5.7.2";
src = fetchFromGitHub {
owner = "microsoft";
repo = "TypeScript";
rev = "v${version}";
hash = "sha256-DsGTVqCbzifPmgCrca5M7qeUPiMThByq6esN+bMt4fU=";
hash = "sha256-T74n9lDC6Yt40hwL0BhRjo5q3M3gROY8tQJcuRWWoBQ=";
};
patches = [
./disable-dprint-dstBundler.patch
];
npmDepsHash = "sha256-w3Tm7BJ2usrjut6HrhjgXe7TIgq5PxYeHRenz4aybk4=";
npmDepsHash = "sha256-uaNRgXPZCNpPmZISAS6m4WLYPFTrsJ/w+YfQsQfxTVM=";
passthru.tests = {
version = testers.testVersion {
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ugrep";
version = "7.1.1";
version = "7.1.2";
src = fetchFromGitHub {
owner = "Genivia";
repo = "ugrep";
rev = "v${finalAttrs.version}";
hash = "sha256-l/AHt0OLI76AEOOziFXdfQdJlx6HqdFoEJ27YhwUJnQ=";
hash = "sha256-Gujz4o3EhpUs/GtUBXdimJR06yX1zu6joZkG/9aXrU4=";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -7,11 +7,11 @@
let
pname = "upscayl";
version = "2.11.5";
version = "2.15.0";
src = fetchurl {
url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM=";
hash = "sha256-ZFlFfliby5nneepELc5gi6zaM5FrcBmohit8YlKqgik=";
};
appimageContents = appimageTools.extractType2 {
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "utf8proc";
version = "2.9.0";
version = "2.10.0";
src = fetchFromGitHub {
owner = "JuliaStrings";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Sgh8vTbclUV+lFZdR29PtNUy8F+9L/OAXk647B+l2mg=";
hash = "sha256-wmtMo6eBK/xxxkIeJfh5Yb293po9cKK+7WjqNPoxM9g=";
};
nativeBuildInputs = [ cmake ];
@@ -7,13 +7,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "xdg-terminal-exec";
version = "0.10.1";
version = "0.12.0";
src = fetchFromGitHub {
owner = "Vladimir-csp";
repo = "xdg-terminal-exec";
rev = "v${finalAttrs.version}";
hash = "sha256-bZsyHv4qbL3pdx5gW1sPG/vn6luKG1mvgR4ZmzYDDwE=";
hash = "sha256-4REOOCYiTccbGVKp/EOvcxLOjoPu4Eujazb7mEDIUSQ=";
};
nativeBuildInputs = [ scdoc ];
+2 -2
View File
@@ -14,12 +14,12 @@
stdenv.mkDerivation rec {
pname = "xml-tooling-c";
version = "3.2.4";
version = "3.3.0";
src = fetchgit {
url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
rev = version;
hash = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU=";
hash = "sha256-czmBu7ThDwq+x7FahgZDMHqid8jeUNnTuKMI/Fj4IIw=";
};
buildInputs = [
+6 -3
View File
@@ -1,13 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
enumerable-statistics (2.0.7)
csv (3.3.0)
enumerable-statistics (2.0.8)
unicode_plot (0.0.5)
enumerable-statistics (>= 2.0.1)
youplot (0.4.5)
youplot (0.4.6)
csv
unicode_plot (>= 0.0.5)
PLATFORMS
x86_64-linux
arm64-darwin-22
ruby
@@ -15,4 +18,4 @@ DEPENDENCIES
youplot
BUNDLED WITH
2.5.3
2.5.16
+15 -5
View File
@@ -1,13 +1,23 @@
{
csv = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b";
type = "gem";
};
version = "3.3.0";
};
enumerable-statistics = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dlnfncz0lbyczakgdlys44pksj6h447npj665xk41b36y0lbf7f";
sha256 = "1cqksgv0cf69cd30kxk2r0lq1y784wn5nvlyabfqilf1vvy6j38y";
type = "gem";
};
version = "2.0.7";
version = "2.0.8";
};
unicode_plot = {
dependencies = ["enumerable-statistics"];
@@ -21,14 +31,14 @@
version = "0.0.5";
};
youplot = {
dependencies = ["unicode_plot"];
dependencies = ["csv" "unicode_plot"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0imy65wjkgdkpqfympbz8lp2ih866538vk55fwz9a909ib9sbdri";
sha256 = "1p1vbb7p4h5a4r2rwl64gwv6cmf350grjn97zrpjhvrjih81y3yg";
type = "gem";
};
version = "0.4.5";
version = "0.4.6";
};
}
+3 -3
View File
@@ -93,13 +93,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "zed-editor";
version = "0.166.2";
version = "0.167.1";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
tag = "v${version}";
hash = "sha256-Z3WdJRn6JpZpZlHq2vjIq1EX1vW4+Gv/XAz2H4WH0Fw=";
hash = "sha256-6UwsWOthQHL4+kPogS5DZIg44VPJBT29uIgcxIQJwtU=";
};
patches = [
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-J5vJ/KV94a+9AqGbNZx6sCzWflOZsyUj3NcqnfaexGE=";
cargoHash = "sha256-MT4Ik5m8K1IljnCa1XYrEluz8zHhbEve7cg7Vje8WA4=";
nativeBuildInputs =
[
+11 -3
View File
@@ -23,11 +23,11 @@ assert
stdenv.mkDerivation rec {
pname = "flint3";
version = "3.0.1";
version = "3.1.2";
src = fetchurl {
url = "https://www.flintlib.org/flint-${version}.tar.gz";
sha256 = "sha256-ezEaAFA6hjiB64F32+uEMi8pOZ89fXLzsaTJuh1XlLQ=";
sha256 = "sha256-/bOkMaN0ZINKz/O9wUX0/o0PlR3VMnxMb5P0y6xcJwA=";
};
patches = [
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/flintlib/flint/commit/e7d005c369754243cba32bd782ea2a5fc874fde5.diff";
hash = "sha256-IqEtYEpNVXfoTeerh/0ig+eDqUpAlGdBB3uO8ShYh3o=";
})
# C99 compliance (avoid using I as identifier): https://github.com/flintlib/flint/pull/2027
(fetchpatch {
name = "flint3-reserved-identifier.patch";
url = "https://github.com/flintlib/flint/commit/b579cdd2d45aa1109a764f6838e9888b937e7ac5.patch";
hash = "sha256-8GLlA9ACzzxSiYaxLv9+p0oJA5TS7289b0EyoNcsSaU=";
})
];
nativeBuildInputs = [
@@ -61,7 +67,9 @@ stdenv.mkDerivation rec {
# We're not using autoreconfHook because flint's bootstrap
# script calls autoreconf, among other things.
preConfigurePhase = ''
preConfigure = ''
# the following configure.ac fix is only needed for flint 3.1.X
sed -i 's/if "$ac_cv_prog_cxx_g" = "yes"/if test "$ac_cv_prog_cxx_g" = "yes"/' configure.ac
echo "Executing bootstrap.sh"
./bootstrap.sh
'';
@@ -64,5 +64,5 @@ in {
# Don't forget to change the hashes in xapian-omega and
# python3Packages.xapian. They inherit the version from this package, and
# should always be built with the equivalent xapian version.
xapian_1_4 = generic "1.4.26" "sha256-nmp5A4BpZtFs4iC0k3fJyPrWZ8jw/8sjo0QpRiaTY6c=";
xapian_1_4 = generic "1.4.27" "sha256-vLyZz78WCAEZwlcfwpZ5T1Ob1ULKOSbxfCmZYAgwq2E=";
}
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
hash = "sha256-pbI4bhsE34TRFJqenFvPxeRyammmnaZBuGxo15ln2uQ=";
hash = "sha256-HRk7MoXsFQVXJXsEnuHYyUxAvN6QbOC6fxo4oamlpcE=";
};
buildInputs = [ xapian perl pcre2 zlib libmagic ];
@@ -10,13 +10,13 @@
buildDunePackage rec {
pname = "flac";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-flac";
rev = "v${version}";
sha256 = "sha256-HRRQd//e6Eh2HuyO+U00ILu5FoBT9jf/nRJzDOie70A=";
sha256 = "sha256-68zunpRIX4lrRsKJhDF3Sre6Rp3g+ntP19ObFqG57jE=";
};
nativeBuildInputs = [ pkg-config ];
@@ -29,7 +29,7 @@ buildDunePackage rec {
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-flac";
description = "Bindings for flac";
license = licenses.gpl2Only;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dandellion ];
};
}
@@ -1,7 +1,6 @@
{
lib,
aiohttp,
attrs,
buildPythonPackage,
fetchPypi,
python-socks,
@@ -11,7 +10,7 @@
buildPythonPackage rec {
pname = "aiohttp-socks";
version = "0.9.0";
version = "0.10.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,14 +18,13 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "aiohttp_socks";
hash = "sha256-IhWaGvAmsinP5eoAfgZbs/5WOFqVGoJiOm9FiKZ1gAM=";
hash = "sha256-SfLh+AUfKIVxm+sbd+MStaJ8Pktg8LBFo4jxlNmV4Gg=";
};
build-system = [ setuptools ];
dependencies = [
aiohttp
attrs
python-socks
] ++ python-socks.optional-dependencies.asyncio;
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiolimiter";
version = "1.1.0";
version = "1.2.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "mjpieters";
repo = pname;
rev = "v${version}";
hash = "sha256-BpLh9utf2oJe+83rsIZeV5+MjbJ3aO5slMNVbUywQIo=";
tag = "v${version}";
hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo=";
};
nativeBuildInputs = [ poetry-core ];
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "apispec";
version = "6.6.1";
version = "6.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-9cqkfO51/gO5xQtVlASLTAUu7KLCEuDawS27YXXZplk=";
hash = "sha256-hhzKgrvAZSyprOqJaSGyVJRFgDQv3oSfhvbawazGypY=";
};
nativeBuildInputs = [ flit-core ];
@@ -11,7 +11,7 @@
let
pname = "bitsandbytes";
version = "0.44.1";
version = "0.45.0";
inherit (torch) cudaPackages cudaSupport;
inherit (cudaPackages) cudaVersion;
@@ -56,8 +56,8 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "TimDettmers";
repo = "bitsandbytes";
rev = "refs/tags/${version}";
hash = "sha256-yvxD5ymMK5p4Xg7Csx/90mPV3yxUC6QUuF/8BKO2p0k=";
tag = version;
hash = "sha256-HoZNEDhCPgGwFgwT4NqkbUAy0bYqvki75FBZn5aLuKM=";
};
# By default, which library is loaded depends on the result of `torch.cuda.is_available()`.
@@ -46,14 +46,14 @@
buildPythonPackage rec {
pname = "bokeh";
# update together with panel which is not straightforward
version = "3.6.0";
version = "3.6.2";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-ADLcHnatCXsHYm5RWEaF/0jGVIH7qq0QVmOxBGFlhno=";
hash = "sha256-LzBD2eyz1dwujA6/itVXJ2FxiNTlNPPnIIs2NX41I5Y=";
};
src_test = fetchFromGitHub {
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "branca";
version = "0.8.0";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "python-visualization";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9imrW4u2Ea1q7VKgk6Vs8y2OiSzAPr3W6471pi/gVm4=";
tag = "v${version}";
hash = "sha256-Gnr3ONqWpUNOGiOlyq77d9PxcDT8TjqTHYBGxH+V+xc=";
};
postPatch = ''
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "cantools";
version = "39.4.13";
version = "40.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-rYT7Vh9asgzNKkW3/LKQkwCPbImByfY28tlGE+03w9E=";
hash = "sha256-Wy0tfFAe2JA7vIEE4ojO9MKd7m9Yu2Yrx0vYvgPVmsI=";
};
nativeBuildInputs = [
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "django-admin-datta";
version = "1.0.15";
version = "1.0.16";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-QVobNrSZyDMldrhSccPnBEfXrwphVgtJ03yBHfTpits=";
hash = "sha256-ef7SwKRbzuUWuwf24p5hxLXllEdCwqixoMEFy33f3Tc=";
};
propagatedBuildInputs = [ django ];

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