Merge dbff0491a2 into haskell-updates
This commit is contained in:
nixpkgs-ci[bot]
@@ -1511,6 +1511,12 @@
|
||||
githubId = 37040543;
|
||||
name = "Wroclaw";
|
||||
};
|
||||
amronos = {
|
||||
email = "aarav@spikonado.com";
|
||||
github = "Amronos";
|
||||
githubId = 134804732;
|
||||
name = "Aarav Gupta";
|
||||
};
|
||||
amuckstot30 = {
|
||||
github = "amuckstot30";
|
||||
githubId = 157274630;
|
||||
@@ -9412,6 +9418,15 @@
|
||||
githubId = 10353047;
|
||||
name = "Tobias Happ";
|
||||
};
|
||||
gesperon = {
|
||||
email = "gesperon@mac.com";
|
||||
github = "gesperon";
|
||||
githubId = 117491118;
|
||||
name = "Gabor Esperon";
|
||||
keys = [
|
||||
{ fingerprint = "8102 3AF7 84FC 4DA7 B9D7 ECFF A0AF 4AD2 D44C C6FE"; }
|
||||
];
|
||||
};
|
||||
getchoo = {
|
||||
name = "Seth Flynn";
|
||||
email = "getchoo@tuta.io";
|
||||
@@ -16460,6 +16475,12 @@
|
||||
githubId = 1472826;
|
||||
name = "Max Smolin";
|
||||
};
|
||||
maxmosk = {
|
||||
email = "maximmosk4@gmail.com";
|
||||
github = "maxmosk";
|
||||
githubId = 89240935;
|
||||
name = "Maxim Moskalets";
|
||||
};
|
||||
maxstrid = {
|
||||
email = "mxwhenderson@gmail.com";
|
||||
github = "maxstrid";
|
||||
@@ -21526,7 +21547,7 @@
|
||||
email = "raven6107@gmail.com";
|
||||
github = "r4v3n6101";
|
||||
githubId = 30029970;
|
||||
keys = [ { fingerprint = "FA05 8A29 B45E 06C0 8FE9 4907 05D2 BE42 F3EC D7CC"; } ];
|
||||
keys = [ { fingerprint = "66AE 3F93 364C 6AB8 18F9 F35D 8D1E 0726 2DFD BD00"; } ];
|
||||
};
|
||||
raboof = {
|
||||
email = "arnout@bzzt.net";
|
||||
@@ -28248,6 +28269,12 @@
|
||||
githubId = 1322287;
|
||||
name = "William O'Hanley";
|
||||
};
|
||||
woile = {
|
||||
email = "santiwilly@gmail.com";
|
||||
github = "woile";
|
||||
githubId = 2585816;
|
||||
name = "Santiago Fraire Willemoes";
|
||||
};
|
||||
woky = {
|
||||
email = "pampu.andrei@pm.me";
|
||||
github = "andreisergiu98";
|
||||
|
||||
@@ -1728,6 +1728,7 @@
|
||||
./services/web-apps/suwayomi-server.nix
|
||||
./services/web-apps/szurubooru.nix
|
||||
./services/web-apps/trilium.nix
|
||||
./services/web-apps/tuliprox.nix
|
||||
./services/web-apps/umami.nix
|
||||
./services/web-apps/vikunja.nix
|
||||
./services/web-apps/wakapi.nix
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
let
|
||||
cfge = config.environment;
|
||||
|
||||
cfg = config.programs.fish;
|
||||
|
||||
fishAbbrs = lib.concatStringsSep "\n" (
|
||||
@@ -21,16 +20,14 @@ let
|
||||
);
|
||||
|
||||
envShellInit = pkgs.writeText "shellInit" cfge.shellInit;
|
||||
|
||||
envLoginShellInit = pkgs.writeText "loginShellInit" cfge.loginShellInit;
|
||||
|
||||
envInteractiveShellInit = pkgs.writeText "interactiveShellInit" cfge.interactiveShellInit;
|
||||
|
||||
# Need to use --no-config to prevent fish_indent from trying to read from config
|
||||
# See https://github.com/fish-shell/fish-shell/issues/12079
|
||||
indentFishFile =
|
||||
name: text:
|
||||
pkgs.runCommand name {
|
||||
pkgs.runCommandLocal name {
|
||||
nativeBuildInputs = [ cfg.package ];
|
||||
inherit text;
|
||||
passAsFile = [ "text" ];
|
||||
@@ -49,11 +46,9 @@ let
|
||||
|
||||
babelfishTranslate =
|
||||
path: name:
|
||||
pkgs.runCommand "${name}.fish" {
|
||||
preferLocalBuild = true;
|
||||
pkgs.runCommandLocal "${name}.fish" {
|
||||
nativeBuildInputs = [ pkgs.babelfish ];
|
||||
} "babelfish < ${path} > $out;";
|
||||
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -275,10 +270,10 @@ in
|
||||
};
|
||||
generateCompletions =
|
||||
package:
|
||||
pkgs.runCommand
|
||||
pkgs.runCommandLocal
|
||||
(
|
||||
with lib.strings;
|
||||
let
|
||||
inherit (lib.strings) stringLength substring storeDir;
|
||||
storeLength = stringLength storeDir + 34; # Nix' StorePath::HashLen + 2 for the separating slash and dash
|
||||
pathName = substring storeLength (stringLength package - storeLength) package;
|
||||
in
|
||||
@@ -287,7 +282,6 @@ in
|
||||
(
|
||||
{
|
||||
inherit package;
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
// lib.optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }
|
||||
)
|
||||
@@ -308,8 +302,7 @@ in
|
||||
# include programs that bring their own completions
|
||||
{
|
||||
pathsToLink =
|
||||
[ ]
|
||||
++ lib.optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
|
||||
lib.optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
|
||||
++ lib.optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
|
||||
++ lib.optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
|
||||
}
|
||||
@@ -343,5 +336,8 @@ in
|
||||
'';
|
||||
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ sigmasquadron ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
llakala
|
||||
sigmasquadron
|
||||
];
|
||||
}
|
||||
|
||||
@@ -12,12 +12,22 @@ in
|
||||
enable = lib.mkEnableOption "Niri, a scrollable-tiling Wayland compositor";
|
||||
|
||||
package = lib.mkPackageOption pkgs "niri" { };
|
||||
|
||||
useNautilus = lib.mkEnableOption "Nautilus as file-chooser for xdg-desktop-portal-gnome" // {
|
||||
default = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (
|
||||
lib.mkMerge [
|
||||
{
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.systemPackages = [
|
||||
cfg.package
|
||||
]
|
||||
# Required for xdg-desktop-portal-gnome's FileChooser to work properly
|
||||
++ lib.optionals cfg.useNautilus [
|
||||
pkgs.nautilus
|
||||
];
|
||||
|
||||
services = {
|
||||
displayManager.sessionPackages = [ cfg.package ];
|
||||
@@ -34,6 +44,10 @@ in
|
||||
|
||||
configPackages = [ cfg.package ];
|
||||
|
||||
config.niri = lib.mkIf (!cfg.useNautilus) {
|
||||
"org.freedesktop.impl.portal.FileChooser" = lib.mkDefault "gtk";
|
||||
};
|
||||
|
||||
# Recommended by upstream, required for screencast support
|
||||
# https://github.com/YaLTeR/niri/wiki/Important-Software#portals
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gnome ];
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
env = pkgs.buildEnv {
|
||||
name = "zsh-${name}-env";
|
||||
paths = cfg.customPkgs;
|
||||
pathsToLink = "/share/zsh/${dir}";
|
||||
pathsToLink = [ "/share/zsh/${dir}" ];
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -242,6 +242,12 @@ in
|
||||
default = "/mfs";
|
||||
description = "Where to mount the MFS namespace to";
|
||||
};
|
||||
|
||||
Mounts.FuseAllowOther = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Allow all users to access the FUSE mount points";
|
||||
};
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
@@ -333,7 +339,7 @@ in
|
||||
boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000;
|
||||
boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000;
|
||||
|
||||
programs.fuse = lib.mkIf cfg.autoMount {
|
||||
programs.fuse = lib.mkIf (cfg.autoMount && cfg.settings.Mounts.FuseAllowOther) {
|
||||
userAllowOther = true;
|
||||
};
|
||||
|
||||
@@ -366,10 +372,6 @@ in
|
||||
systemd.packages =
|
||||
if cfg.autoMount then [ cfg.package.systemd_unit ] else [ cfg.package.systemd_unit_hardened ];
|
||||
|
||||
services.kubo.settings = lib.mkIf cfg.autoMount {
|
||||
Mounts.FuseAllowOther = lib.mkDefault true;
|
||||
};
|
||||
|
||||
systemd.services.ipfs = {
|
||||
path = [
|
||||
"/run/wrappers"
|
||||
|
||||
@@ -45,9 +45,8 @@ in
|
||||
{
|
||||
address = "0.0.0.0";
|
||||
port = 8080;
|
||||
scope = "/srv/public";
|
||||
modify = true;
|
||||
auth = true;
|
||||
directory = "/srv/public";
|
||||
permissions = "R";
|
||||
users = [
|
||||
{
|
||||
username = "{env}ENV_USERNAME";
|
||||
|
||||
@@ -77,10 +77,12 @@ let
|
||||
PersistentKeepalive = peer.persistentKeepalive;
|
||||
};
|
||||
|
||||
generateNetwork = name: interface: {
|
||||
matchConfig.Name = name;
|
||||
address = interface.ips;
|
||||
};
|
||||
generateNetwork =
|
||||
name: interface:
|
||||
nameValuePair "40-${name}" {
|
||||
matchConfig.Name = name;
|
||||
address = interface.ips;
|
||||
};
|
||||
|
||||
cfg = config.networking.wireguard;
|
||||
|
||||
@@ -236,7 +238,7 @@ in
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
netdevs = mapAttrs' generateNetdev cfg.interfaces;
|
||||
networks = mapAttrs generateNetwork cfg.interfaces;
|
||||
networks = mapAttrs' generateNetwork cfg.interfaces;
|
||||
};
|
||||
|
||||
environment.etc = mapAttrs' generateRefreshNetdevMode refreshEnabledInterfaces;
|
||||
|
||||
@@ -17,6 +17,7 @@ let
|
||||
mkIf
|
||||
maintainers
|
||||
escape
|
||||
replaceString
|
||||
collect
|
||||
mapAttrsRecursive
|
||||
optionals
|
||||
@@ -43,7 +44,9 @@ let
|
||||
collect isString (
|
||||
mapAttrsRecursive (
|
||||
path: value:
|
||||
"${escape [ sep ] (concatStringsSep "\\" ([ k ] ++ path))}${sep}${mkValueStringDefault { } value}"
|
||||
"${escape [ sep ] (concatStringsSep "\\" ([ k ] ++ path))}${sep}${
|
||||
replaceString "\n" "\\n" (mkValueStringDefault { } value)
|
||||
}"
|
||||
) v
|
||||
)
|
||||
)
|
||||
|
||||
@@ -210,7 +210,7 @@ in
|
||||
root * ${cfg.ui.package}/dist
|
||||
file_server
|
||||
}
|
||||
handle_path /static/${cfg.ui.package.passthru.commit_sha}/* {
|
||||
handle_path /static/${cfg.ui.package.version}/* {
|
||||
root * ${cfg.ui.package}/dist
|
||||
file_server
|
||||
}
|
||||
|
||||
@@ -331,10 +331,10 @@ in
|
||||
proxy_buffering off;
|
||||
proxy_request_buffering off;
|
||||
''
|
||||
+ lib.optionalString (lib.elem "brotli" config.services.nginx.additionalModules) ''
|
||||
+ lib.optionalString (lib.any (m: m.name == "brotli") config.services.nginx.additionalModules) ''
|
||||
brotli off;
|
||||
''
|
||||
+ lib.optionalString (lib.elem "zstd" config.services.nginx.additionalModules) ''
|
||||
+ lib.optionalString (lib.any (m: m.name == "zstd") config.services.nginx.additionalModules) ''
|
||||
zstd off;
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -0,0 +1,336 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.tuliprox;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
systemSettingsYaml = settingsFormat.generate "config.yml" cfg.systemSettings;
|
||||
sourceSettingsYaml = settingsFormat.generate "source.yml" cfg.sourceSettings;
|
||||
apiProxySettingsYaml = settingsFormat.generate "api-proxy.yml" cfg.apiProxySettings;
|
||||
mappingSettingsYaml = settingsFormat.generate "mapping.yml" cfg.mappingSettings;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ nyanloutre ];
|
||||
|
||||
options.services.tuliprox = {
|
||||
enable = lib.mkEnableOption "Tuliprox IPTV playlist processor & proxy";
|
||||
|
||||
package = lib.mkPackageOption pkgs "tuliprox" { };
|
||||
|
||||
extraArgs = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Additional command-line arguments for the systemd service.
|
||||
|
||||
Refer to the [Tuliprox documentation] for available arguments.
|
||||
|
||||
[Tuliprox documentation]: https://github.com/euzu/tuliprox?tab=readme-ov-file#command-line-arguments
|
||||
'';
|
||||
};
|
||||
|
||||
systemSettings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
example = {
|
||||
api = {
|
||||
host = "0.0.0.0";
|
||||
port = 8901;
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
Main config file
|
||||
|
||||
Refer to the [Tuliprox documentation] for available attributes
|
||||
|
||||
[Tuliprox documentation]: https://github.com/euzu/tuliprox?tab=readme-ov-file#1-configyml
|
||||
'';
|
||||
};
|
||||
|
||||
sourceSettings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
example = {
|
||||
templates = [
|
||||
{
|
||||
name = "not_red_button";
|
||||
value = "NOT (Title ~ \"(?i).*red button.*\")";
|
||||
}
|
||||
{
|
||||
name = "not_low_resolution";
|
||||
value = "NOT (Title ~ \"(?i).*\(360p|240p\).*\")";
|
||||
}
|
||||
{
|
||||
name = "all_channels";
|
||||
value = "Title ~ \".*\"";
|
||||
}
|
||||
{
|
||||
name = "final_channel_lineup";
|
||||
value = "!all_channels! AND !not_red_button! AND !not_low_resolution!";
|
||||
}
|
||||
];
|
||||
sources = [
|
||||
{
|
||||
inputs = [
|
||||
{
|
||||
name = "iptv-org";
|
||||
type = "m3u";
|
||||
url = "https://iptv-org.github.io/iptv/countries/uk.m3u";
|
||||
}
|
||||
];
|
||||
targets = [
|
||||
{
|
||||
name = "iptv-org";
|
||||
output = [
|
||||
{
|
||||
type = "xtream";
|
||||
}
|
||||
{
|
||||
type = "m3u";
|
||||
filename = "iptv.m3u";
|
||||
}
|
||||
{
|
||||
type = "hdhomerun";
|
||||
username = "local";
|
||||
device = "hdhr1";
|
||||
}
|
||||
];
|
||||
filter = "!final_channel_lineup!";
|
||||
options = {
|
||||
ignore_logo = false;
|
||||
share_live_streams = true;
|
||||
};
|
||||
mapping = [
|
||||
"iptv-org"
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
description = ''
|
||||
Source definitions
|
||||
|
||||
Refer to the [Tuliprox documentation] for available attributes
|
||||
|
||||
[Tuliprox documentation]: https://github.com/euzu/tuliprox?tab=readme-ov-file#2-sourceyml
|
||||
'';
|
||||
};
|
||||
|
||||
apiProxySettings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
example = {
|
||||
server = [
|
||||
{
|
||||
name = "default";
|
||||
protocol = "http";
|
||||
host = "192.169.1.9";
|
||||
port = 8901;
|
||||
timezone = "Europe/Paris";
|
||||
message = "Welcome to tuliprox";
|
||||
}
|
||||
{
|
||||
name = "external";
|
||||
protocol = "https";
|
||||
host = "tuliprox.mydomain.tv";
|
||||
port = 443;
|
||||
timezone = "Europe/Paris";
|
||||
message = "Welcome to tuliprox";
|
||||
}
|
||||
];
|
||||
user = [
|
||||
{
|
||||
target = "xc_m3u";
|
||||
credentials = [
|
||||
{
|
||||
username = "test1";
|
||||
password = "secret1";
|
||||
token = "token1";
|
||||
proxy = "reverse";
|
||||
server = "default";
|
||||
exp_date = 1672705545;
|
||||
max_connections = 1;
|
||||
status = "Active";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
description = ''
|
||||
Users and proxy configuration
|
||||
|
||||
Refer to the [Tuliprox documentation] for available attributes
|
||||
|
||||
[Tuliprox documentation]: https://github.com/euzu/tuliprox?tab=readme-ov-file#3-api-proxy-config
|
||||
'';
|
||||
};
|
||||
|
||||
mappingSettings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
example = {
|
||||
mappings = {
|
||||
templates = [
|
||||
{
|
||||
name = "bbc";
|
||||
value = "Title ~ \"^BBC\"";
|
||||
}
|
||||
{
|
||||
name = "documentary";
|
||||
value = "(Group ~ \"(Documentary|Outdoor)\")";
|
||||
}
|
||||
{
|
||||
name = "entertainment";
|
||||
value = "Group ~ \"Entertainment\"";
|
||||
}
|
||||
{
|
||||
name = "pluto_tv";
|
||||
value = "(Caption ~ \"Pluto TV\") AND NOT(Caption ~ \"Sports\")";
|
||||
}
|
||||
{
|
||||
name = "business";
|
||||
value = "Group ~ \"Business\"";
|
||||
}
|
||||
];
|
||||
mapping = [
|
||||
{
|
||||
id = "iptv-org";
|
||||
match_as_ascii = true;
|
||||
mapper = [
|
||||
{
|
||||
filter = "!bbc!";
|
||||
script = ''
|
||||
@Group = "BBC"
|
||||
'';
|
||||
}
|
||||
{
|
||||
filter = "!documentary!";
|
||||
script = ''
|
||||
@Group = "Documentary"
|
||||
'';
|
||||
}
|
||||
{
|
||||
filter = "!entertainment!";
|
||||
script = ''
|
||||
@Group = "Entertainment"
|
||||
'';
|
||||
}
|
||||
{
|
||||
filter = "!pluto_tv!";
|
||||
script = ''
|
||||
@Group = "Pluto TV"
|
||||
'';
|
||||
}
|
||||
{
|
||||
filter = "!business!";
|
||||
script = ''
|
||||
@Group = "News"
|
||||
'';
|
||||
}
|
||||
{
|
||||
filter = "Input ~ \"iptv-org\"";
|
||||
script = ''
|
||||
@Caption = concat(@Caption, " (iptv-org)")
|
||||
'';
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
Templates configuration
|
||||
|
||||
Refer to the [Tuliprox documentation] for available attributes
|
||||
|
||||
[Tuliprox documentation]: https://github.com/euzu/tuliprox?tab=readme-ov-file#2-mappingyml
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.tuliprox.systemSettings = {
|
||||
api = {
|
||||
host = lib.mkDefault "127.0.0.1";
|
||||
port = lib.mkDefault 8901;
|
||||
web_root = lib.mkDefault "${cfg.package}/web";
|
||||
};
|
||||
working_dir = lib.mkDefault "\${env:STATE_DIRECTORY}/data";
|
||||
backup_dir = lib.mkDefault "\${env:STATE_DIRECTORY}/backup";
|
||||
custom_stream_response_path = lib.mkDefault "${cfg.package}/resources";
|
||||
};
|
||||
services.tuliprox.sourceSettings.sources = lib.mkDefault [ ];
|
||||
services.tuliprox.apiProxySettings = {
|
||||
server = lib.mkDefault [
|
||||
{
|
||||
name = "default";
|
||||
protocol = "http";
|
||||
host = cfg.systemSettings.api.host;
|
||||
port = cfg.systemSettings.api.port;
|
||||
timezone = if config.time.timeZone != null then config.time.timeZone else "Etc/UTC";
|
||||
message = "Welcome to tuliprox";
|
||||
}
|
||||
];
|
||||
user = lib.mkDefault [ ];
|
||||
};
|
||||
services.tuliprox.mappingSettings.mappings.mapping = lib.mkDefault [ ];
|
||||
|
||||
systemd.services.tuliprox = {
|
||||
description = "Tuliprox server";
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = utils.escapeSystemdExecArgs (
|
||||
[
|
||||
(lib.getExe cfg.package)
|
||||
"--server"
|
||||
"--config"
|
||||
systemSettingsYaml
|
||||
"--source"
|
||||
sourceSettingsYaml
|
||||
"--api-proxy"
|
||||
apiProxySettingsYaml
|
||||
"--mapping"
|
||||
mappingSettingsYaml
|
||||
]
|
||||
++ cfg.extraArgs
|
||||
);
|
||||
Restart = "always";
|
||||
|
||||
DynamicUser = true;
|
||||
StateDirectory = "tuliprox";
|
||||
|
||||
CapabilityBoundingSet = "";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_UNIX"
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
UMask = "0066";
|
||||
};
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1582,6 +1582,7 @@ in
|
||||
trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix;
|
||||
tsm-client-gui = runTest ./tsm-client-gui.nix;
|
||||
ttyd = runTest ./web-servers/ttyd.nix;
|
||||
tuliprox = runTest ./tuliprox.nix;
|
||||
tuned = runTest ./tuned.nix;
|
||||
tuptime = runTest ./tuptime.nix;
|
||||
turbovnc-headless-server = runTest ./turbovnc-headless-server.nix;
|
||||
|
||||
@@ -12,7 +12,10 @@ let
|
||||
testing.makeTest {
|
||||
name = "initrd-secrets-${compressor}";
|
||||
|
||||
meta.maintainers = [ ];
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
broken = pkgs.stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
name = "tuliprox";
|
||||
meta.maintainers = with lib.maintainers; [ nyanloutre ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.tuliprox = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.wait_for_open_port(8901)
|
||||
machine.succeed("curl -v -s http://127.0.0.1:8901/")
|
||||
'';
|
||||
}
|
||||
@@ -38,17 +38,17 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "7.47";
|
||||
version = "7.54";
|
||||
|
||||
src = fetchurl {
|
||||
url = url_for_platform version stdenv.hostPlatform.qemuArch;
|
||||
hash =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
"sha256-exVal9bXNNRaAVTz+c+cugs9TZ8GB8yyCA6jkeW8ipQ="
|
||||
"sha256-1C7FfFULm7ZYdKHU/x5BcoiISRoySvFDqRjJZ+OiqLc="
|
||||
else
|
||||
{
|
||||
x86_64-linux = "sha256-sbkUEGecqw5Fbl5Ev8pwlE5nMxNz8bf90d641S3cT8Y=";
|
||||
aarch64-linux = "sha256-8VNmIUa4c/cGVlegx9joD6tX1cTDBWnM2GklCINsJa0=";
|
||||
x86_64-linux = "sha256-DOhWauKjIv5cah+6yO/ZkHQ6X0qcyxxWD6B2xH/zm4c=";
|
||||
aarch64-linux = "sha256-TD6kHAzNBSDQxmT23VJwCUcfblp4DffOaKhKVPSAg6w=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
@@ -37,6 +37,9 @@ let
|
||||
|
||||
buildFeatures = [ "luajit" ];
|
||||
|
||||
# Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
|
||||
env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
|
||||
|
||||
checkFlags = [
|
||||
# Disabled because they access the network.
|
||||
"--skip=test_hf"
|
||||
|
||||
@@ -26,6 +26,8 @@ let
|
||||
env = {
|
||||
# TODO: remove this if plugin stops using nightly rust
|
||||
RUSTC_BOOTSTRAP = true;
|
||||
# Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
|
||||
RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -23,7 +23,12 @@ let
|
||||
|
||||
cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU=";
|
||||
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
env = {
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
# Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
|
||||
RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
|
||||
};
|
||||
|
||||
# NOTE: Disabled upstream too
|
||||
doCheck = false;
|
||||
|
||||
@@ -29,6 +29,9 @@ let
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
# Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
|
||||
env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
|
||||
|
||||
buildInputs = [
|
||||
libuv.dev
|
||||
];
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
perl,
|
||||
openssl,
|
||||
vimUtils,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
perl,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
vimUtils,
|
||||
}:
|
||||
let
|
||||
version = "65aeacf-unstable-2025-11-03";
|
||||
@@ -35,6 +36,9 @@ let
|
||||
RUSTC_BOOTSTRAP = 1; # We need rust unstable features
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
# Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
|
||||
RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.49";
|
||||
hash = "sha256-norWEwxgAFlylLH+NphYdmpb0vkVcmkidi0SN8Kr6R0=";
|
||||
version = "2.0.50";
|
||||
hash = "sha256-wYDJPzqWPUTdVnba35BioFgV6jeBiZlagQ5L8gzwVF0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3023,8 +3023,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "mesonbuild";
|
||||
name = "mesonbuild";
|
||||
version = "1.27.0";
|
||||
hash = "sha256-dEDDw8fDBkRYE09mrOzQNzAhWZEczTTahBZT4nhrClw=";
|
||||
version = "1.28.0";
|
||||
hash = "sha256-mvW0u0Tpc1JqoFJYyRirdcLDCHfm72XvTs8sFvvw490=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "sourcegraph";
|
||||
name = "amp";
|
||||
version = "0.0.1763727068";
|
||||
hash = "sha256-rbL0i6JS/I59NiOlkt6v3GVea4vLyzN7BMFYkbDpWho=";
|
||||
version = "0.0.1763851087";
|
||||
hash = "sha256-x579QIkkFBAa1w6e6mtmx2sHQ3ypDcDWWVge6kCq9wU=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2025-11-16";
|
||||
version = "0-unstable-2025-11-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "79fa66dde4caea81b51910b7ea907951651e5fea";
|
||||
hash = "sha256-MBMxuRdgafar5zdlYLnIoIalBzuK3XS0FwuyllOab18=";
|
||||
rev = "012dbe9dc11fd5fd765ef92e0ad4c08583862f69";
|
||||
hash = "sha256-hsv8eeU+/cuknyKQ7WNKrmRYu7kXLxu7bPkoVN9qZoE=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -363,13 +363,13 @@
|
||||
"vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
|
||||
},
|
||||
"equinix_equinix": {
|
||||
"hash": "sha256-qF3v9sol5/pdK+WCsz69eT/xAwsSfjnCjKTa+AXuBUI=",
|
||||
"hash": "sha256-78gEVUTWuHtZh1qPyO/J2YjCJvHnRSko7gbS38Z6EC0=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v4.10.0",
|
||||
"rev": "v4.11.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-GEdgHY2cIiXxeIYev7zbGd4c+IyZZfeZtSj9Z/gG6E4="
|
||||
"vendorHash": "sha256-vk5yWeMhQBm8txzAxgD8JtpQnZcETWFdDQJQ2nipRAA="
|
||||
},
|
||||
"exoscale_exoscale": {
|
||||
"hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=",
|
||||
@@ -1048,11 +1048,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"oracle_oci": {
|
||||
"hash": "sha256-1qYfGPM+Vh7r5UZY0cGjKWM/mxk8kF8S9K2NacrOWB8=",
|
||||
"hash": "sha256-PZ83SwGSgkQ8v+Hy56e8zipgbIR7Q/2rY27/5Zzwuok=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v7.26.1",
|
||||
"rev": "v7.27.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -12,11 +12,11 @@ let
|
||||
variants = rec {
|
||||
x86_64-linux = {
|
||||
discord = rec {
|
||||
version = "0.0.111";
|
||||
version = "0.0.115";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-o4U6i223Agtbt1N9v0GO/Ivx68OQcX/N3mHXUX2gruA=";
|
||||
hash = "sha256-DXGlo9qdmJTqm6ResvspauQ0awIFSuYalcpVXEfTxK4=";
|
||||
};
|
||||
|
||||
branch = "stable";
|
||||
@@ -25,11 +25,11 @@ let
|
||||
self = discord;
|
||||
};
|
||||
discord-ptb = rec {
|
||||
version = "0.0.161";
|
||||
version = "0.0.167";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
hash = "sha256-pDWOnj8tQK9runi/QzcvEFbNGCwAb/gISM9LrLoTzxM=";
|
||||
hash = "sha256-Q4IrmvoP//49GN2L9kRQ/zG28XjicJEXZpVG6RklFB8=";
|
||||
};
|
||||
|
||||
branch = "ptb";
|
||||
@@ -38,11 +38,11 @@ let
|
||||
self = discord-ptb;
|
||||
};
|
||||
discord-canary = rec {
|
||||
version = "0.0.761";
|
||||
version = "0.0.811";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-L3MIcrz/xj8zOb2QVXBrBCHGt4BdHhjwKpPZ4iClQYQ=";
|
||||
hash = "sha256-kg0o5KyBohmnk/czUQLVsA1GV2P6DUQLy0KhMaj80Sk=";
|
||||
};
|
||||
|
||||
branch = "canary";
|
||||
@@ -51,11 +51,11 @@ let
|
||||
self = discord-canary;
|
||||
};
|
||||
discord-development = rec {
|
||||
version = "0.0.89";
|
||||
version = "0.0.92";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
hash = "sha256-ZMsBR0LAISrM3dib8fehW/eZGkwSCinQF60jJG76O7M=";
|
||||
hash = "sha256-oG50YrXQUCnbn+rO0EeRjixeqvXYBdnyqdomdPfxfos=";
|
||||
};
|
||||
|
||||
branch = "development";
|
||||
|
||||
@@ -40,6 +40,8 @@ let
|
||||
"SSE4.1"
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
"SSE4.1"
|
||||
else if stdenv.hostPlatform.system == "aarch64-darwin" then
|
||||
"ARM_NEON_ASIMD"
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
"ARM_NEON_ASIMD"
|
||||
else
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hy3";
|
||||
version = "0.51.0";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outfoxxed";
|
||||
repo = "hy3";
|
||||
tag = "hl${finalAttrs.version}";
|
||||
hash = "sha256-HjbofK4rSLkkUvOZHdoAY6kn7Ok2bXo14eOKr8hKRHE=";
|
||||
hash = "sha256-UeMEUlQsil5DEtF/VQ//41vXJF9ff2xjoYVjhR6dqu4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.7.8";
|
||||
version = "1.7.9";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
@@ -19,10 +19,10 @@ buildGoModule rec {
|
||||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0bUWsEBfIZdl+wPt4nysZ5SbSz8AaRg1WutqMxCqdfk=";
|
||||
hash = "sha256-QZVZ4pF69rtdXmFIMXooTpAjzPM4TTzUKVVMWYqmUvQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JWdVcX1wAituPb0N4Sg6tM9gsygEPFUblBPH2YcpBvE=";
|
||||
vendorHash = "sha256-oejeEImMgNXnbDIFg7MslcisVJj4Pl150ZMJ0YqGdLM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "adcli";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3a";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "realmd";
|
||||
repo = "adcli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
|
||||
hash = "sha256-IKZ6LW9+aUhNNNp6SL9jllkk7HI/7Ekv7EQo3jQ2VG4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
xdg-user-dirs,
|
||||
keybinder3,
|
||||
libnotify,
|
||||
curl,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -18,11 +17,11 @@ let
|
||||
rec {
|
||||
x86_64-linux = {
|
||||
urlSuffix = "linux-x86_64.tar.gz";
|
||||
hash = "sha256-E0N07kvABMrjWyRNpLmYsJ+ZY8+1NcR3ND4wNxUvAEA=";
|
||||
hash = "sha256-q5hFX4qO4BJdrsCvZJICCHwOEUYMjk9mnJ61/MCycxs=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
urlSuffix = "macos-universal.zip";
|
||||
hash = "sha256-wziZaxSmGnEZDeKi5kQvrQwfHZ/Uan5gRseIIqXYvsI=";
|
||||
hash = "sha256-0deWxb0nUSkCQ7eXo3XqfonlMTItQHixuAC2iYry8Ec=";
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}
|
||||
@@ -31,7 +30,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "appflowy";
|
||||
version = "0.10.0";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
|
||||
@@ -49,7 +48,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
gtk3
|
||||
keybinder3
|
||||
libnotify
|
||||
curl
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -3,51 +3,59 @@
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nodejs_20,
|
||||
nodejs_latest,
|
||||
versionCheckHook,
|
||||
node-gyp,
|
||||
python3,
|
||||
udev,
|
||||
cctools,
|
||||
xcbuild,
|
||||
}:
|
||||
|
||||
let
|
||||
buildNpmPackage' = buildNpmPackage.override {
|
||||
nodejs = nodejs_20;
|
||||
nodejs = nodejs_latest;
|
||||
};
|
||||
node-gyp' = node-gyp.override {
|
||||
nodejs = nodejs_20;
|
||||
nodejs = nodejs_latest;
|
||||
};
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "22.4.13";
|
||||
version = "23.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nke7EQscVPu1A/d4DKi7pSb6/MQgeFtG+zhMZT+bhWk=";
|
||||
hash = "sha256-T4eOiFpU17vAwAM02gwJq93ZtJQUC7bv0CCFpj4NKEA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-GQXbXkOt8nkOB2OeEcKsp1yJd5lXS+KKout/5ffLgD0=";
|
||||
npmDepsHash = "sha256-kRkc3o8xmROlH17GI3yoGvMwEweHrLeGpvW3rH0wOSU=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
node-gyp'
|
||||
python3
|
||||
versionCheckHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
cctools
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
udev
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
# Disabled on Darwin due to:
|
||||
#
|
||||
# https://github.com/NixOS/nix/issues/5748
|
||||
#
|
||||
# No matter whether $TMP and $HOME point to real writable directories, the
|
||||
# Darwin sandbox tries to use /var/empty and fails.
|
||||
doInstallCheck = !stdenv.hostPlatform.isDarwin;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/balena";
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "basedpyright";
|
||||
version = "1.33.0";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "detachhead";
|
||||
repo = "basedpyright";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7msVXU2ypoohLxTfJ6qt1zFF1zG2GBPD3zSBjA2EhMM=";
|
||||
hash = "sha256-GTyxJBjzRlCjyaa7xayHzlKQApCbMTh+MUOEZydjteA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-zNmZ4wXxe31NnQ+VlTLoPM2zTDmKdw1D28pi/roybdQ=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "bitrise";
|
||||
version = "2.34.6";
|
||||
version = "2.34.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitrise-io";
|
||||
repo = "bitrise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wA+IknAOkVxTwBohw8D4suksENoWymqPJycbfx6cFYQ=";
|
||||
hash = "sha256-5L44yqHk2fvSQ7cPGB2gf2lJfQGfIg8g2sGrqDxiyMY=";
|
||||
};
|
||||
|
||||
# many tests rely on writable $HOME/.bitrise and require network access
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
util-linux,
|
||||
alsaSupport ? stdenv.hostPlatform.isLinux,
|
||||
alsa-lib,
|
||||
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
systemd,
|
||||
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,
|
||||
systemdMinimal,
|
||||
ncurses,
|
||||
udevCheckHook,
|
||||
buildPackages,
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
tcl # For TCL bindings
|
||||
]
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional systemdSupport systemd;
|
||||
++ lib.optional systemdSupport systemdMinimal;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -139,6 +139,6 @@ stdenv.mkDerivation rec {
|
||||
)
|
||||
substituteInPlace $out/libexec/brltty/systemd-wrapper \
|
||||
--replace 'logger' "${util-linux}/bin/logger" \
|
||||
--replace 'udevadm' "${systemd}/bin/udevadm"
|
||||
--replace 'udevadm' "${systemdMinimal}/bin/udevadm"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "brush";
|
||||
version = "0.2.23";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reubeno";
|
||||
repo = "brush";
|
||||
tag = "brush-shell-v${version}";
|
||||
hash = "sha256-b3foza29ty4P09PaBFh1nmGyn1YsxNPiVQHUcwWo6Lg=";
|
||||
hash = "sha256-Ib7IRjehcftCETUAT1+otXRdTFFOOwMN4mjnArYLP7Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+HUZNOPPyRn2tQel/8fIiRQo761G3ygfRPuvjHkRAV8=";
|
||||
cargoHash = "sha256-mD6zrYX5xlEfV56syb0jqxE3jUO28asugOHKz27hTC4=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
lzip,
|
||||
patch,
|
||||
|
||||
# nativeBuildInputs
|
||||
installShellFiles,
|
||||
|
||||
# tests
|
||||
addBinToPathHook,
|
||||
gitMinimal,
|
||||
@@ -62,6 +65,10 @@ python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildstream-plugins
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fuse3
|
||||
lzip
|
||||
@@ -110,6 +117,12 @@ python3Packages.buildPythonApplication rec {
|
||||
"tests/internals/cascache.py"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd bst \
|
||||
--bash src/buildstream/data/bst \
|
||||
--zsh src/buildstream/data/zsh/_bst
|
||||
'';
|
||||
|
||||
versionCheckProgram = "${placeholder "out"}/bin/bst";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
yq-go,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
dart,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -26,7 +27,7 @@ flutter335.buildFlutterApplication {
|
||||
|
||||
sourceRoot = "${src.name}/app";
|
||||
|
||||
gitHashes = lib.importJSON ./gitHashes.json;
|
||||
gitHashes = lib.importJSON ./git-hashes.json;
|
||||
|
||||
postInstall = ''
|
||||
cp -r linux/debian/usr/share $out/share
|
||||
@@ -43,14 +44,30 @@ flutter335.buildFlutterApplication {
|
||||
yq eval --output-format=json --prettyPrint $src/app/pubspec.lock > "$out"
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater {
|
||||
ignoredVersions = ".*(rc|beta).*";
|
||||
rev-prefix = "v";
|
||||
})
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "butterfly.pubspecSource" ./pubspec.lock.json)
|
||||
(
|
||||
(gitUpdater {
|
||||
ignoredVersions = ".*(rc|beta).*";
|
||||
rev-prefix = "v";
|
||||
})
|
||||
// {
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
)
|
||||
(
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "butterfly.pubspecSource" ./pubspec.lock.json)
|
||||
// {
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
)
|
||||
{
|
||||
command = [ ./update-gitHashes.py ];
|
||||
supportedFeatures = [ "silent" ];
|
||||
command = [
|
||||
dart.fetchGitHashesScript
|
||||
"--input"
|
||||
./pubspec.lock.json
|
||||
"--output"
|
||||
./git-hashes.json
|
||||
];
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
copyPkgconfigItems,
|
||||
makePkgconfigItem,
|
||||
version ? "2.1.3",
|
||||
version ? "2.2.0",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
rev = "rel-${version}";
|
||||
hash =
|
||||
{
|
||||
"2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4=";
|
||||
"2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg=";
|
||||
"2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
|
||||
}
|
||||
.${version};
|
||||
|
||||
@@ -16,7 +16,7 @@ let
|
||||
"cli"
|
||||
"desktop"
|
||||
];
|
||||
version = "0.52.0";
|
||||
version = "0.53.1";
|
||||
|
||||
system = stdenv.hostPlatform.system;
|
||||
isLinux = stdenv.isLinux;
|
||||
@@ -26,19 +26,19 @@ let
|
||||
cliSources = {
|
||||
x86_64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-gxB5GeJXTrPDGRXxKV3kdYQ0VgmmIeO8rggRPQlTDqw=";
|
||||
hash = "sha256-qSrgEg0iEx5Mpe+meHnkrOgM9zcQJBzoH5KlMy8FE5Q=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-aarch64.tar.gz";
|
||||
hash = "sha256-VaYy3OkAeuxZ0+UFENOvFYowa9jExQd3WO7VFJ6kPMg=";
|
||||
hash = "sha256-mgIjo+1y2jxC7lPUkLjuwIq4F8SagjQAyfeqaoeQX9w=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-x86_64.zip";
|
||||
hash = "sha256-GhPKxkCJjhwafmXOgaCePCn3g1Mls+ZFu4xWBzVXaQo=";
|
||||
hash = "sha256-iPDYQXWaxt32MxbAWL0496i7IO0FEt8di4E0msagfEo=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-aarch64.zip";
|
||||
hash = "sha256-R394RFaYHm8zi4gKuaP0Ljhybq/80MGYlTlld3tACdQ=";
|
||||
hash = "sha256-5b9TrR5ZqlN17OgIaQ9vPIccwOiELNcidjinF3rf6Zc=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -46,19 +46,19 @@ let
|
||||
desktopSources = {
|
||||
x86_64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-ANCMHJTeH0UyJvCpslbxc0I3BbfPfR7kr4UISWeo2ec=";
|
||||
hash = "sha256-/puWhX5ooz994f1COw356HSfqcOmJaAweccTIWl9KCo=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
|
||||
hash = "sha256-tlNcxc+eh/Y0HrkMXWJ2SP+Lr5xfXJUAhZAgk7s/WRE=";
|
||||
hash = "sha256-iYaWN6Nu0+zPSUzlhUS5EIuYO32BVkBLZrPA9h7DpfM=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
|
||||
hash = "sha256-c2Hc6KCwgebAa3rHAvV9FgVeiexSuwqYbe85PwNxV08=";
|
||||
hash = "sha256-iPDYQXWaxt32MxbAWL0496i7IO0FEt8di4E0msagfEo=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
|
||||
hash = "sha256-fbhQ4Q0TyRySd3k9h7CutnreVJj29+XvX/RM1cDTRSg=";
|
||||
hash = "sha256-5b9TrR5ZqlN17OgIaQ9vPIccwOiELNcidjinF3rf6Zc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "carapace";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carapace-sh";
|
||||
repo = "carapace-bin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QTY2GH2aKTMowNXVVNUDJdHAFVhCPFBh2p+Mgon88EI=";
|
||||
hash = "sha256-q7G7odkRwh4/w8H09exXYSC7n4CUeoG2iKb/k2D/gek=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lswmq4j4nz7k+CRpyZhAubEZD59lNKpT/w3mQ4JlMys=";
|
||||
vendorHash = "sha256-eADiOSLqouH9saTgbbQY18wc3DxCBvqdVKI32I7sTWQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
udev,
|
||||
systemdLibs,
|
||||
xorg,
|
||||
version ? "141.0.7",
|
||||
gitRevision ? "a5714cc",
|
||||
chromiumVersion ? "141.0.7390.108",
|
||||
version ? "142.0.10",
|
||||
gitRevision ? "29548e2",
|
||||
chromiumVersion ? "142.0.7444.135",
|
||||
buildType ? "Release",
|
||||
srcHashes ? {
|
||||
aarch64-linux = "sha256-2A0hVzUVMBemhjnFE/CrKs4CU96Qkxy8S/SieaEJjwE=";
|
||||
x86_64-linux = "sha256-tZzUxeXxbYP8YfIQLbiSyihPcjZM9cd2Ad8gGCSvdGk=";
|
||||
aarch64-linux = "sha256-wUCXk5Nqgzu0q0PvV8a2AKF3h4YxxTeaP2yVecrf0j8=";
|
||||
x86_64-linux = "sha256-pFMHjj4MktjnX3g03sgLqgai4X/lF29Phmduf7a+KfM=";
|
||||
},
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq common-updater-scripts
|
||||
#!nix-shell -i bash -p curl gnused jq nix-update
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
current_version=$(nix-instantiate --eval -E "with import ./. {}; cef-binary or (lib.getVersion cef-binary)" | tr -d '"')
|
||||
current_version=$(nix-instantiate --eval -E "with import ./. {}; cef-binary.version or (lib.getVersion cef-binary)" | tr -d '"')
|
||||
|
||||
ROOT="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
|
||||
|
||||
@@ -30,14 +30,5 @@ update_nix_value version "$cef_version"
|
||||
update_nix_value gitRevision "$git_revision"
|
||||
update_nix_value chromiumVersion "$chromium_version"
|
||||
|
||||
declare -a platforms=(
|
||||
"x86_64-linux 64"
|
||||
"aarch64-linux arm64"
|
||||
)
|
||||
|
||||
for platform in "${platforms[@]}"; do
|
||||
read -r system arch <<< "$platform"
|
||||
url="https://cef-builds.spotifycdn.com/cef_binary_${cef_version}+g${git_revision}+chromium-${chromium_version}_linux${arch}_minimal.tar.bz2"
|
||||
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")")
|
||||
update-source-version cef-binary "$cef_version" "$hash" --system="$system" --ignore-same-version
|
||||
done
|
||||
nix-update pkgsCross.gnu64.cef-binary --version skip
|
||||
nix-update pkgsCross.aarch64-multiplatform.cef-binary --version skip
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cider-2";
|
||||
version = "3.1.1";
|
||||
version = "3.1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb";
|
||||
hash = "sha256-2gd/ThI59GFU/lMKFLtwHeRWSqp14jFd8YMrV8Cu/oQ=";
|
||||
hash = "sha256-cYtUVoDSESzElmmvhTPhLBXjiZF6fo3cJaw1QYCtVCg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.49",
|
||||
"version": "2.0.50",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.49",
|
||||
"version": "2.0.50",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.49";
|
||||
version = "2.0.50";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-ht6s8NOPgwS3Vnwd+2ECO8KAWbXZOL8ZNnOFMNxmAdI=";
|
||||
hash = "sha256-mZQkqeL/F/9u5esy1j1pUjcyzeaShREx+vMuvZ5Zrz8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-KqLOvyZ9YYdUIeyzdlElOIq2bjieTbklCbVIoYSE63g=";
|
||||
npmDepsHash = "sha256-/5Qh99vAcTiFz6FrzJgm26RserqxVjLYqOOx5q5hkgc=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "codex-acp";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "codex-acp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PY8nEHH/Wu5K0V1A3DbgEYXjgh1noO2uGeb6eRsTzRw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mswFSCdo/QEPVoMTJRtdAzgI9mQmFqmRIUxhb5qV+OY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An ACP-compatible coding agent powered by Codex";
|
||||
homepage = "https://github.com/zed-industries/codex-acp";
|
||||
changelog = "https://github.com/zed-industries/codex-acp/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ tlvince ];
|
||||
platforms = platforms.unix;
|
||||
sourceProvenance = with sourceTypes; [ fromSource ];
|
||||
mainProgram = "codex-acp";
|
||||
};
|
||||
}
|
||||
@@ -6,17 +6,18 @@
|
||||
jre,
|
||||
maven,
|
||||
makeWrapper,
|
||||
unzip,
|
||||
nixosTests,
|
||||
writeText,
|
||||
}:
|
||||
let
|
||||
version = "4.6.0";
|
||||
version = "5.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Athou";
|
||||
repo = "commafeed";
|
||||
tag = version;
|
||||
hash = "sha256-Qc2l/CSVK+8k7b3RZA8hQsGTq29OvkDMbMzHcnPm/yE=";
|
||||
hash = "sha256-B0ztra7j5V5Qm0DRpu4cl04tmOE1gS89NOV2kyMrzOg=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
@@ -26,7 +27,7 @@ let
|
||||
|
||||
sourceRoot = "${src.name}/commafeed-client";
|
||||
|
||||
npmDepsHash = "sha256-bQShz6dmE9IZ9to5Z2DScncc/WVJnX1tRCm8XQJNmiU=";
|
||||
npmDepsHash = "sha256-TD57bDY/7/zYT1T/HOl0+G59/hct8fzJaKaMC8/bBEI=";
|
||||
|
||||
nativeBuildInputs = [ biome ];
|
||||
|
||||
@@ -52,7 +53,7 @@ maven.buildMavenPackage {
|
||||
|
||||
pname = "commafeed";
|
||||
|
||||
mvnHash = "sha256-7nm8Cz05Qa44TMC0ioklvKAXQnE9J2wUDZFXLQt2A1w=";
|
||||
mvnHash = "sha256-ipGxdX/LHEn2mQa2JhfeMTmg0esj5Z+7fJ3W2ipLfto=";
|
||||
|
||||
mvnParameters = lib.escapeShellArgs [
|
||||
"-Dskip.installnodenpm"
|
||||
@@ -61,7 +62,10 @@ maven.buildMavenPackage {
|
||||
"-Dmaven.gitcommitid.skip"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
@@ -79,21 +83,14 @@ maven.buildMavenPackage {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share
|
||||
install -Dm644 commafeed-server/target/commafeed.jar $out/share/commafeed.jar
|
||||
install -Dm644 commafeed-server/config.yml.example $out/share/config.yml
|
||||
unzip -d $out/share/ commafeed-server/target/commafeed-$version-h2-jvm.zip
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/commafeed \
|
||||
--add-flags "-jar $out/share/commafeed.jar"
|
||||
--add-flags "-jar $out/share/commafeed-$version-h2/quarkus-run.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/config.yml \
|
||||
--replace-fail 'url: jdbc:h2:/commafeed/data/db;DEFRAG_ALWAYS=TRUE' \
|
||||
'url: jdbc:h2:./database/db;DEFRAG_ALWAYS=TRUE'
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.commafeed;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "copybara";
|
||||
version = "20251027";
|
||||
version = "20251117";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
|
||||
hash = "sha256-IHW6y6WXJFjX9RYD+IwVAMwAbEo36fLqonIKR+FaqpQ=";
|
||||
hash = "sha256-QbmBrkkqLtB/5ZS9o+Z4KKbogFv5lccEGgLZsuVuPrg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
just,
|
||||
libcosmicAppHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-ext-applet-minimon";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "minimon-applet";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tUAp6GN5oJYhALjTpEELMOEBpfao5D9B0hl2ecNtwMg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qgqlEufv9vLLIOcDLiX76xRcXal1Q0S5726ua+8R8Ek=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
dontUseJustCheck = true;
|
||||
|
||||
justFlags = [
|
||||
"--set"
|
||||
"prefix"
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"bin-src"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-applet-minimon"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/cosmic-utils/minimon-applet/releases/tag/v${finalAttrs.version}";
|
||||
description = "COSMIC applet for displaying CPU/Memory/Network/Disk/GPU usage in the Panel or Dock";
|
||||
homepage = "https://github.com/cosmic-utils/minimon-applet";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "cosmic-applet-minimon";
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
just,
|
||||
libcosmicAppHook,
|
||||
pipewire,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-ext-applet-privacy-indicator";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "D-Brox";
|
||||
repo = "cosmic-ext-applet-privacy-indicator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LfvnVkyXRl58YAXi98B/c0DXve+tT4picRlT6+t4Hqw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Tbcjnbjyo+FoYtRe5KnPiEzV+1PkzHOnbVDRe/pJul0=";
|
||||
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
name = "deduplicate-sctk.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/D-Brox/cosmic-ext-applet-privacy-indicator/pull/7.diff?full_index=1";
|
||||
hash = "sha256-BN32JHouyIqJzBR6Mlp2pw/JhU5c6hdtG+P2SEl/0pA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [ pipewire ];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
dontUseJustCheck = true;
|
||||
|
||||
justFlags = [
|
||||
"--set"
|
||||
"prefix"
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"bin-src"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-applet-privacy-indicator"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/D-Brox/cosmic-ext-applet-privacy-indicator/releases/tag/v${finalAttrs.version}";
|
||||
description = "Privacy indicator applet for the COSMIC Desktop Environment";
|
||||
homepage = "https://github.com/D-Brox/cosmic-ext-applet-privacy-indicator";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "cosmic-ext-applet-privacy-indicator";
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cyme";
|
||||
version = "2.2.7";
|
||||
version = "2.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuna-f1sh";
|
||||
repo = "cyme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-StvkMo9HZzAx3T+dnRQBUZJOC3EOj+ItqO13vW+F/SU=";
|
||||
hash = "sha256-PHYzaynxzKYYNTB/pJVuSZoiN3/zwixjqoxXzbxToVc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-roLuOVkBSDZ+2bHEcA53CcdtE82EO4/anCvlVHeTC0s=";
|
||||
cargoHash = "sha256-NTsiAW9SLN6vuNtbdrXqtvutnI/2DLCgMjYxG6tTtFM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "deck";
|
||||
version = "1.53.1";
|
||||
version = "1.53.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uLT/VTO3+KVfAvnFnsyFo9oRwkxA0wgUDmRgQwhXLfY=";
|
||||
hash = "sha256-txALVamKm1ADwSsSNei04LNqKr5lkEYB4OyxpjvMk90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -28,7 +28,7 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-EygCZy0IXvqr2874nKFQTi+Pm56J75cpQUrPo7JGUNc=";
|
||||
vendorHash = "sha256-eg9Ks3IGNzGIanY3jsGtAPb/iYYDitskt0slaX8b+qs=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "deezer-enhanced";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb";
|
||||
hash = "sha256-/FEp9J+5YrwPIu6/zPqUYjYRSU1iHdoIRs7WJLQIu+8=";
|
||||
hash = "sha256-n7/yEzr40ApBzE+kLWehgMHwkoom4QT9fYLSuFqVA7s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
version = "4.13.5";
|
||||
version = "4.13.6";
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
pname = "dependency-track-frontend";
|
||||
@@ -25,7 +25,7 @@ let
|
||||
owner = "DependencyTrack";
|
||||
repo = "frontend";
|
||||
rev = version;
|
||||
hash = "sha256-6/19GEbb0OK+FZLfl5kWqigZFU5ygoMK3h1IWj924Uk=";
|
||||
hash = "sha256-SSnbmAFXQwxAZQzMZeDzf/ebbWUVRICAs1msFXMMi98=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -33,7 +33,7 @@ let
|
||||
cp -R ./dist $out/
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-pLb606++UYqruqGiKALMHbdDmvf9OF6CtHuwRhHoJ5o=";
|
||||
npmDepsHash = "sha256-2VK3LOqUxOJaR8cUuINhrhMkvHGyUr206RJR18NCvUo=";
|
||||
forceGitDeps = true;
|
||||
makeCacheWritable = true;
|
||||
|
||||
@@ -50,7 +50,7 @@ maven.buildMavenPackage rec {
|
||||
owner = "DependencyTrack";
|
||||
repo = "dependency-track";
|
||||
rev = version;
|
||||
hash = "sha256-WMIM43CzVE+7ZkcSXUxwcs7G1tpf+mMMLkfo2DCSV2Q=";
|
||||
hash = "sha256-EL0Yd8pfTG8/DlY9A3F0lRuPl/wU2/LyACclzttrsjw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -65,7 +65,7 @@ maven.buildMavenPackage rec {
|
||||
'';
|
||||
|
||||
mvnJdk = jre_headless;
|
||||
mvnHash = "sha256-mrjsFnd9y8ReJmnRpD2nO9G9q7ksrRHhguTyoctIB3U=";
|
||||
mvnHash = "sha256-HZK/o/RMbMj7OUfucizO5/LpJhwNhHfwbyvUOcO13dA=";
|
||||
manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
|
||||
buildOffline = true;
|
||||
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dexed";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asb2m10";
|
||||
repo = "dexed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-mXr1KGzA+DF2dEgAJE4lpnefPqO8pqfnKa43vyjSJgU=";
|
||||
hash = "sha256-SPIcaFwx4uGx4Bc1EH1FTnAZ2BAno2h3iO0yhB3G71U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -64,18 +64,18 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawpile";
|
||||
version = "2.2.2";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drawpile";
|
||||
repo = "drawpile";
|
||||
rev = version;
|
||||
sha256 = "sha256-xcutcSpbFt+pb7QP1E/RG6iNnZwpfhIZTxr+1usLKHc=";
|
||||
sha256 = "sha256-0paLKxAEvlbExq426xTekBt+Dkphx7Wg/AtpYN3f/4w=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-VUX6J7TfxWpa07HPFZ8JzpltIwJUYAl5TABIpBmGYYo=";
|
||||
hash = "sha256-u9fRbxKeQSou9Umw4EaqzzzDiN4zhyfx9sWnlZpfpxU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -111,7 +111,10 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://drawpile.net/";
|
||||
downloadPage = "https://drawpile.net/download/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ fgaz ];
|
||||
maintainers = with lib.maintainers; [
|
||||
fgaz
|
||||
qubic
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
}
|
||||
|
||||
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "famistudio";
|
||||
version = "4.4.3";
|
||||
version = "4.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BleuBleu";
|
||||
repo = "FamiStudio";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DUXIQIZa0Ppr4EtvDKN5T3XZoc8rBILn+mVnjFGxlxA=";
|
||||
hash = "sha256-hYJ82EXR1kP8hzUj+CCXnGuohVzyA1O9TBpWjRccj9Y=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "famly-fetch";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jacobbunk";
|
||||
repo = "famly-fetch";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ua2g+YGzMHfMGZrOSKzeqdT/ppanZZWJHjrRxfwVDmE=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
click
|
||||
importlib-resources
|
||||
piexif
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "famly_fetch" ];
|
||||
|
||||
# No tests in the repository
|
||||
doCheck = false;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Fetch your (kid's) images from famly.co";
|
||||
homepage = "https://github.com/jacobbunk/famly-fetch";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tlvince ];
|
||||
mainProgram = "famly-fetch";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
{ python3Packages }: python3Packages.toPythonApplication python3Packages.fava-investor
|
||||
@@ -69,7 +69,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optional (
|
||||
stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")
|
||||
) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma"
|
||||
++ lib.optional enableMpi "--enable-mpi"
|
||||
++ lib.optionals enableMpi [
|
||||
"--enable-mpi"
|
||||
# link libfftw3_mpi explicitly with -lmpi
|
||||
# linker on darwin requires all symbols to be resolvable at link time
|
||||
# see
|
||||
# https://github.com/FFTW/fftw3/issues/274
|
||||
# https://github.com/spack/spack/pull/29279
|
||||
"MPILIBS=-lmpi"
|
||||
]
|
||||
# doc generation causes Fortran wrapper generation which hard-codes gcc
|
||||
++ lib.optional (!withDoc) "--disable-doc";
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "freifunk-meshviewer";
|
||||
|
||||
version = "12.6.0";
|
||||
version = "12.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freifunk";
|
||||
repo = "meshviewer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-h+0f6RwJip3V7XJ8q8eEov2k09wNwdHOJgR2XUZqkgw=";
|
||||
sha256 = "sha256-nle99URK1s8v+fatpf9D0dIOIp6BKeaEYZ1PijLkt9A=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-QgUEoUF2qEtplx2YaMO81g9cY7a+oXCX5dF6V54waD8=";
|
||||
npmDepsHash = "sha256-6XUe55X1WDPNldPRlgqG1C7CuGyYrS2vSiLmoza3QIs=";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/freifunk-meshviewer/
|
||||
|
||||
@@ -18,6 +18,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-CZsVd9ob4FHC9KeepK7OHWatVTJUiJEjqtaylhD+yS0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "uv_build>=0.8.11,<0.9.0" "uv_build"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "pydantic" ];
|
||||
|
||||
build-system = with python3.pkgs; [ uv-build ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gat";
|
||||
version = "0.25.4";
|
||||
version = "0.25.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koki-develop";
|
||||
repo = "gat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DRTSI6fCakVjAzGGlisvTkDiIQKXlv3XQ3SfB2UjiC8=";
|
||||
hash = "sha256-NE/m5fp+iJDlz3AtkjIAlO4CB7CVLeWzXYY5xCYX+cI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-287u3zjlEOuc45stq7k1v5IINRUASw83sw6Dmqv9aUs=";
|
||||
vendorHash = "sha256-TZz7aAKMld7KFbW+vcysgSO+Tp9+Qb5enYBJCpiPWDA=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo124Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
buildGo124Module rec {
|
||||
pname = "gci";
|
||||
version = "0.13.7";
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gemini-cli-bin";
|
||||
version = "0.16.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
|
||||
hash = "sha256-BL+qIQgqqVuOQzCVjS9lnExijM0XDj5v3+RPkbspw9Q=";
|
||||
hash = "sha256-TKuI7UC9ofUzRZFqdjY2LEiagjdE2IC471iXkhUCAyw=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ghostfolio";
|
||||
version = "2.217.0";
|
||||
version = "2.218.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostfolio";
|
||||
repo = "ghostfolio";
|
||||
tag = version;
|
||||
hash = "sha256-W2dkSMKa9Tg+1vZUs9dBEuNIFqF6c1FquO80y2Dw1QA=";
|
||||
hash = "sha256-r/C/P+tdfaTLe0yCa5XPUg8O4NO9cHEF7EXzyfpkpD8=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -27,7 +27,7 @@ buildNpmPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-1d06JlZYzvrL+GE2zCaNtYCwAmVpa9Yg4Ov9Fn/w97c=";
|
||||
npmDepsHash = "sha256-EMLQUZaL6u5jsOgBa67bivUHItJo8JeGZLbIq6tJdgE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
prisma
|
||||
|
||||
@@ -1,163 +0,0 @@
|
||||
From 3e82a4f5017972c7d28151a468bb71fe7d2279e0 Mon Sep 17 00:00:00 2001
|
||||
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
|
||||
Date: Mon, 13 Jan 2025 01:45:12 +0000
|
||||
Subject: [PATCH] fix(deps): update rust crate git2 to 0.20.0
|
||||
|
||||
---
|
||||
Cargo.lock | 8 ++++----
|
||||
git-mit-config/Cargo.toml | 2 +-
|
||||
git-mit-install/Cargo.toml | 2 +-
|
||||
git-mit-relates-to/Cargo.toml | 2 +-
|
||||
git-mit/Cargo.toml | 2 +-
|
||||
mit-commit-message-lints/Cargo.toml | 2 +-
|
||||
mit-commit-msg/Cargo.toml | 2 +-
|
||||
mit-hook-test-helper/Cargo.toml | 2 +-
|
||||
mit-pre-commit/Cargo.toml | 2 +-
|
||||
mit-prepare-commit-msg/Cargo.toml | 2 +-
|
||||
10 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 11c858e8..db9e01dd 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -783,9 +783,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "git2"
|
||||
-version = "0.19.0"
|
||||
+version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
|
||||
+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
|
||||
dependencies = [
|
||||
"bitflags 2.7.0",
|
||||
"libc",
|
||||
@@ -1075,9 +1075,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
|
||||
|
||||
[[package]]
|
||||
name = "libgit2-sys"
|
||||
-version = "0.17.0+1.8.1"
|
||||
+version = "0.18.0+1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
|
||||
+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
diff --git a/git-mit-config/Cargo.toml b/git-mit-config/Cargo.toml
|
||||
index aa1fd61e..3ec0cd93 100644
|
||||
--- a/git-mit-config/Cargo.toml
|
||||
+++ b/git-mit-config/Cargo.toml
|
||||
@@ -15,7 +15,7 @@ mit-lint = "3.2.9"
|
||||
shell-words = "1.1.0"
|
||||
thiserror = "1.0.69"
|
||||
miette = { version = "7.4.0", features = [ "fancy" ] }
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
clap_complete = "4.5.42"
|
||||
clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] }
|
||||
diff --git a/git-mit-install/Cargo.toml b/git-mit-install/Cargo.toml
|
||||
index a7611272..96f58672 100644
|
||||
--- a/git-mit-install/Cargo.toml
|
||||
+++ b/git-mit-install/Cargo.toml
|
||||
@@ -18,7 +18,7 @@ clap_complete = "4.5.42"
|
||||
clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] }
|
||||
|
||||
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
|
||||
indoc = "2.0.5"
|
||||
diff --git a/git-mit-relates-to/Cargo.toml b/git-mit-relates-to/Cargo.toml
|
||||
index d50d2aa9..c6676bf8 100644
|
||||
--- a/git-mit-relates-to/Cargo.toml
|
||||
+++ b/git-mit-relates-to/Cargo.toml
|
||||
@@ -17,7 +17,7 @@ thiserror = "1.0.69"
|
||||
miette = { version = "7.4.0", features = [ "fancy" ] }
|
||||
clap_complete = "4.5.42"
|
||||
clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] }
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
|
||||
|
||||
diff --git a/git-mit/Cargo.toml b/git-mit/Cargo.toml
|
||||
index ce108e96..fdda0c55 100644
|
||||
--- a/git-mit/Cargo.toml
|
||||
+++ b/git-mit/Cargo.toml
|
||||
@@ -17,7 +17,7 @@ thiserror = "1.0.69"
|
||||
miette = { version = "7.4.0", features = [ "fancy" ] }
|
||||
clap_complete = "4.5.42"
|
||||
clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] }
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
|
||||
|
||||
diff --git a/mit-commit-message-lints/Cargo.toml b/mit-commit-message-lints/Cargo.toml
|
||||
index 623b120b..042d71b6 100644
|
||||
--- a/mit-commit-message-lints/Cargo.toml
|
||||
+++ b/mit-commit-message-lints/Cargo.toml
|
||||
@@ -18,7 +18,7 @@ time = { version = "0.3.37", features = ["local-offset"] }
|
||||
glob = "0.3.2"
|
||||
thiserror = "1.0.69"
|
||||
miette = { version = "7.4.0", features = [ "fancy" ] }
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
regex = "1.11.1"
|
||||
serde_yaml = "0.9.34"
|
||||
diff --git a/mit-commit-msg/Cargo.toml b/mit-commit-msg/Cargo.toml
|
||||
index 3b8c626e..2c5e1a4f 100644
|
||||
--- a/mit-commit-msg/Cargo.toml
|
||||
+++ b/mit-commit-msg/Cargo.toml
|
||||
@@ -16,7 +16,7 @@ tokio = { version = "1.43.0", features = ["full"] }
|
||||
mit-lint = "3.2.9"
|
||||
clap_complete = "4.5.42"
|
||||
clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] }
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
miette = { version = "7.4.0", features = [ "fancy" ] }
|
||||
mit-commit = "3.2.1"
|
||||
diff --git a/mit-hook-test-helper/Cargo.toml b/mit-hook-test-helper/Cargo.toml
|
||||
index 44131375..bccd79ab 100644
|
||||
--- a/mit-hook-test-helper/Cargo.toml
|
||||
+++ b/mit-hook-test-helper/Cargo.toml
|
||||
@@ -14,7 +14,7 @@ description = "Testing help tools for git-mit"
|
||||
|
||||
[dependencies]
|
||||
tempfile = "3.15.0"
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
|
||||
|
||||
diff --git a/mit-pre-commit/Cargo.toml b/mit-pre-commit/Cargo.toml
|
||||
index 40ff8a0f..4ce23ff7 100644
|
||||
--- a/mit-pre-commit/Cargo.toml
|
||||
+++ b/mit-pre-commit/Cargo.toml
|
||||
@@ -16,7 +16,7 @@ thiserror = "1.0.69"
|
||||
miette = { version = "7.4.0", features = [ "fancy" ] }
|
||||
clap_complete = "4.5.42"
|
||||
clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] }
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
mit-commit = "3.2.1"
|
||||
|
||||
diff --git a/mit-prepare-commit-msg/Cargo.toml b/mit-prepare-commit-msg/Cargo.toml
|
||||
index fcbbcd14..2aa93263 100644
|
||||
--- a/mit-prepare-commit-msg/Cargo.toml
|
||||
+++ b/mit-prepare-commit-msg/Cargo.toml
|
||||
@@ -19,7 +19,7 @@ miette = { version = "7.4.0", features = [ "fancy" ] }
|
||||
shell-words = "1.1.0"
|
||||
clap_complete = "4.5.42"
|
||||
clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] }
|
||||
-git2 = "0.19.0"
|
||||
+git2 = "0.20.0"
|
||||
openssl = { version = "0.10.68", optional = true }
|
||||
mit-commit = "3.2.1"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
libgit2,
|
||||
openssl,
|
||||
@@ -10,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.14.4";
|
||||
version = "6.0.11";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
@@ -19,16 +18,11 @@ rustPlatform.buildRustPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8XWwzR9TiSCU6fKbrulKpCDFDEyzQpaT2nrahF8iac8=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hnmhvql7oTbNQnBvWlV60bxddH7H7intEsjfXhV4Z2Y=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# https://github.com/PurpleBooth/git-mit/pull/1543
|
||||
./libgit2-update.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-B2XRdcwcFxMwnDl5ndIw72OEsn6D2Y8rIoeO4tclJkk=";
|
||||
cargoHash = "sha256-4HNr/m+n+M1BaL67Fo/S4A9EXBYOIp7il0sAtm4rSQc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitea,
|
||||
lib,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-pages-cli";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "git-pages";
|
||||
repo = "git-pages-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uwp7/l4AsVwKPWKkPjPJqPqR7f+N4ksgq44HctLBiGo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5vjUhN3lCr41q91lOD7v0F9c6a8GJj7wBGnnzgFBhJU=";
|
||||
|
||||
ldflags = [
|
||||
"-X"
|
||||
"main.versionOverride=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Command-line application for uploading a site to a git-pages server";
|
||||
homepage = "https://codeberg.org/git-pages/git-pages-cli";
|
||||
changelog = "https://codeberg.org/git-pages/git-pages-cli/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd0;
|
||||
mainProgram = "git-pages-cli";
|
||||
maintainers = with lib.maintainers; [ dramforever ];
|
||||
};
|
||||
})
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "github-copilot-cli";
|
||||
version = "0.0.358";
|
||||
version = "0.0.362";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-+OjC5m5KnZrp0qquMT/Nf4xFoXS/Dz7XBG8djwktYMk=";
|
||||
hash = "sha256-9mgxPqRvST5biM/0/GavF2yvgnIdk1Irdp/FcQTB1iU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -154,11 +154,12 @@ let
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "GitKraken Desktop";
|
||||
name = "gitkraken";
|
||||
exec = "gitkraken";
|
||||
icon = "gitkraken";
|
||||
desktopName = "GitKraken Desktop";
|
||||
genericName = "Git Client";
|
||||
startupWMClass = "GitKraken";
|
||||
categories = [ "Development" ];
|
||||
comment = "Unleash your repo";
|
||||
})
|
||||
|
||||
@@ -2,13 +2,14 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.3.4)
|
||||
asciidoctor (2.0.23)
|
||||
base64 (0.2.0)
|
||||
asciidoctor (2.0.26)
|
||||
base64 (0.3.0)
|
||||
builder (3.3.0)
|
||||
concurrent-ruby (1.3.5)
|
||||
crass (1.0.6)
|
||||
creole (0.5.0)
|
||||
date (3.4.1)
|
||||
date (3.5.0)
|
||||
erb (6.0.0)
|
||||
expression_parser (0.9.0)
|
||||
gemojione (4.3.3)
|
||||
json
|
||||
@@ -32,7 +33,7 @@ GEM
|
||||
therubyrhino (~> 2.1.0)
|
||||
useragent (~> 0.16.2)
|
||||
webrick (~> 1.7)
|
||||
gollum-lib (6.0)
|
||||
gollum-lib (6.1.0)
|
||||
gemojione (~> 4.1)
|
||||
github-markup (~> 4.0)
|
||||
gollum-rugged_adapter (~> 3.0)
|
||||
@@ -43,81 +44,85 @@ GEM
|
||||
gollum-rugged_adapter (3.0)
|
||||
mime-types (~> 3.4)
|
||||
rugged (~> 1.5)
|
||||
htmlentities (4.3.4)
|
||||
i18n (1.14.6)
|
||||
htmlentities (4.4.2)
|
||||
i18n (1.14.7)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.9.1)
|
||||
json (2.16.0)
|
||||
kramdown (2.5.1)
|
||||
rexml (>= 3.3.9)
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
logger (1.6.5)
|
||||
loofah (2.24.0)
|
||||
logger (1.7.0)
|
||||
loofah (2.24.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
mime-types (3.6.0)
|
||||
mime-types (3.7.0)
|
||||
logger
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2025.0107)
|
||||
mini_portile2 (2.8.8)
|
||||
multi_json (1.15.0)
|
||||
mime-types-data (~> 3.2025, >= 3.2025.0507)
|
||||
mime-types-data (3.2025.0924)
|
||||
mini_portile2 (2.8.9)
|
||||
multi_json (1.17.0)
|
||||
mustache (1.1.1)
|
||||
mustache-sinatra (2.0.0)
|
||||
mustache (~> 1.0)
|
||||
mustermann (3.0.3)
|
||||
mustermann (3.0.4)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
nokogiri (1.18.1)
|
||||
nokogiri (1.18.10)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
octicons (19.14.0)
|
||||
octicons (19.21.0)
|
||||
org-ruby (0.9.12)
|
||||
rubypants (~> 0.2)
|
||||
psych (5.2.3)
|
||||
psych (5.2.6)
|
||||
date
|
||||
stringio
|
||||
racc (1.8.1)
|
||||
rack (3.1.8)
|
||||
rack-protection (4.1.1)
|
||||
rack (3.2.4)
|
||||
rack-protection (4.2.1)
|
||||
base64 (>= 0.1.0)
|
||||
logger (>= 1.6.0)
|
||||
rack (>= 3.0.0, < 4)
|
||||
rack-session (2.1.0)
|
||||
rack-session (2.1.1)
|
||||
base64 (>= 0.1.0)
|
||||
rack (>= 3.0.0)
|
||||
rackup (2.2.1)
|
||||
rack (>= 3)
|
||||
rdoc (6.11.0)
|
||||
rdoc (6.15.1)
|
||||
erb
|
||||
psych (>= 4.0.0)
|
||||
rexml (3.4.0)
|
||||
tsort
|
||||
rexml (3.4.4)
|
||||
rouge (3.30.0)
|
||||
rss (0.3.1)
|
||||
rexml
|
||||
ruby2_keywords (0.0.5)
|
||||
rubypants (0.7.1)
|
||||
rugged (1.9.0)
|
||||
sinatra (4.1.1)
|
||||
sinatra (4.2.1)
|
||||
logger (>= 1.6.0)
|
||||
mustermann (~> 3.0)
|
||||
rack (>= 3.0.0, < 4)
|
||||
rack-protection (= 4.1.1)
|
||||
rack-protection (= 4.2.1)
|
||||
rack-session (>= 2.0.0, < 3)
|
||||
tilt (~> 2.0)
|
||||
sinatra-contrib (4.1.1)
|
||||
sinatra-contrib (4.2.1)
|
||||
multi_json (>= 0.0.2)
|
||||
mustermann (~> 3.0)
|
||||
rack-protection (= 4.1.1)
|
||||
sinatra (= 4.1.1)
|
||||
rack-protection (= 4.2.1)
|
||||
sinatra (= 4.2.1)
|
||||
tilt (~> 2.0)
|
||||
sprockets (4.2.1)
|
||||
sprockets (4.2.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
logger
|
||||
rack (>= 2.2.4, < 4)
|
||||
sprockets-helpers (1.4.0)
|
||||
sprockets (>= 2.2)
|
||||
stringio (3.1.2)
|
||||
stringio (3.1.8)
|
||||
therubyrhino (2.1.2)
|
||||
therubyrhino_jar (>= 1.7.4, < 1.7.9)
|
||||
therubyrhino_jar (1.7.8)
|
||||
tilt (2.6.0)
|
||||
tilt (2.6.1)
|
||||
tsort (0.2.0)
|
||||
twitter-text (1.14.7)
|
||||
unf (~> 0.1.0)
|
||||
unf (0.1.4)
|
||||
@@ -144,4 +149,4 @@ DEPENDENCIES
|
||||
wikicloth
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.22
|
||||
2.7.2
|
||||
|
||||
@@ -4,20 +4,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
|
||||
sha256 = "1hbin3j8wynl2fpqa3d6vb932pyngyfn8j2q6gbbn1n23z7srqqn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.23";
|
||||
version = "2.0.26";
|
||||
};
|
||||
base64 = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
|
||||
sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
};
|
||||
builder = {
|
||||
groups = [ "default" ];
|
||||
@@ -64,10 +64,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
|
||||
sha256 = "1rbfqkzr6i8b6538z16chvrkgywf5p5vafsgmnbmvrmh0ingsx2y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
};
|
||||
erb = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0y95ynlfngs0s5x1w6mwralszhbi9d75lcdbdkqk75wcklzqjc17";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.0";
|
||||
};
|
||||
expression_parser = {
|
||||
groups = [ "default" ];
|
||||
@@ -144,10 +154,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1vgvdmz5rh3ciww95llwax7pz93n4iljsz2q5f2hhynx6csvhriw";
|
||||
sha256 = "0p3d8c2grzrhlx9cyaxpb137hpab0br4avy10l3cp2lgag3pnbpb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0";
|
||||
version = "6.1.0";
|
||||
};
|
||||
gollum-rugged_adapter = {
|
||||
dependencies = [
|
||||
@@ -168,10 +178,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
|
||||
sha256 = "1hy5jvzd4wagk0k0yq7bjm6fa7ba7vjggzjfpri95jifkzvbvbxv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.3.4";
|
||||
version = "4.4.2";
|
||||
};
|
||||
i18n = {
|
||||
dependencies = [ "concurrent-ruby" ];
|
||||
@@ -179,20 +189,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
|
||||
sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.6";
|
||||
version = "1.14.7";
|
||||
};
|
||||
json = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj";
|
||||
sha256 = "098m3q2jrx4xbf0knrbmflsynmmb5x9q9b0bzpmj7jmm1cr30mna";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.9.1";
|
||||
version = "2.16.0";
|
||||
};
|
||||
kramdown = {
|
||||
dependencies = [ "rexml" ];
|
||||
@@ -221,10 +231,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3";
|
||||
sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.5";
|
||||
version = "1.7.0";
|
||||
};
|
||||
loofah = {
|
||||
dependencies = [
|
||||
@@ -235,10 +245,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
|
||||
sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.24.0";
|
||||
version = "2.24.1";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = [
|
||||
@@ -249,40 +259,40 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
|
||||
sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
};
|
||||
mime-types-data = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1jixfirdang1lx9iqkcw03mz43pi4vxlfpb8ha4sbz4cqry4jai3";
|
||||
sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2025.0107";
|
||||
version = "3.2025.0924";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
|
||||
sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.8";
|
||||
version = "2.8.9";
|
||||
};
|
||||
multi_json = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
|
||||
sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
version = "1.17.0";
|
||||
};
|
||||
mustache = {
|
||||
groups = [ "default" ];
|
||||
@@ -311,10 +321,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i";
|
||||
sha256 = "08ma2fmxlm6i7lih4mc3har2fzsbj1pl4hhva65kljf6nfvdryl5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = [
|
||||
@@ -325,20 +335,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0xc4qs4izky1zgafabzykbxk8lc4dq6aivgxmfv3ciy3jrzbw66z";
|
||||
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.1";
|
||||
version = "1.18.10";
|
||||
};
|
||||
octicons = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0a1gvsr0fcxl7z8mnflr1lmmvknr11l05x9rg3c21dnnk6rnain7";
|
||||
sha256 = "1np1wipr98padazkah6flc1iqhs8n2k02w6inrd5v12f75fxw3w9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "19.14.0";
|
||||
version = "19.21.0";
|
||||
};
|
||||
org-ruby = {
|
||||
dependencies = [ "rubypants" ];
|
||||
@@ -360,10 +370,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
|
||||
sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.3";
|
||||
version = "5.2.6";
|
||||
};
|
||||
racc = {
|
||||
groups = [ "default" ];
|
||||
@@ -380,10 +390,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk";
|
||||
sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.8";
|
||||
version = "3.2.4";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = [
|
||||
@@ -395,10 +405,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0sniswjyi0yn949l776h7f67rvx5w9f04wh69z5g19vlsnjm98ji";
|
||||
sha256 = "1b4bamcbpk29i7jvly3i7ayfj69yc1g03gm4s7jgamccvx12hvng";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.1";
|
||||
version = "4.2.1";
|
||||
};
|
||||
rack-session = {
|
||||
dependencies = [
|
||||
@@ -409,10 +419,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23";
|
||||
sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
};
|
||||
rackup = {
|
||||
dependencies = [ "rack" ];
|
||||
@@ -426,15 +436,19 @@
|
||||
version = "2.2.1";
|
||||
};
|
||||
rdoc = {
|
||||
dependencies = [ "psych" ];
|
||||
dependencies = [
|
||||
"erb"
|
||||
"psych"
|
||||
"tsort"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0h00mb8wcj937srrafpjzq0klfi8rfpd4b3xpbvn9ghrn2wnzimy";
|
||||
sha256 = "06j83bdhsmq10083ahz3h125pnycx965cfpmg606l8lbrmrsrgr8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.11.0";
|
||||
version = "6.15.1";
|
||||
};
|
||||
RedCloth = {
|
||||
groups = [ "default" ];
|
||||
@@ -451,10 +465,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ch4k2y80r4glr579kxliqnxld2qa91ydq8fiqam38bzpbps3gpg";
|
||||
sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.0";
|
||||
version = "3.4.4";
|
||||
};
|
||||
rouge = {
|
||||
groups = [ "default" ];
|
||||
@@ -520,10 +534,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af";
|
||||
sha256 = "103h6wjpcqp3i034hi44za2v365yz7qk9s5df8lmasq43nqvkbmp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.1";
|
||||
version = "4.2.1";
|
||||
};
|
||||
sinatra-contrib = {
|
||||
dependencies = [
|
||||
@@ -537,24 +551,25 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1giziwf8mgki581jf40zzw3dhjkkmdg3yxbrahj9krd5h24vb90y";
|
||||
sha256 = "0jkbsaika8pr9bc90ag3wqrhbgiy7h5a93k11j8sls6j8k4r3l0h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.1";
|
||||
version = "4.2.1";
|
||||
};
|
||||
sprockets = {
|
||||
dependencies = [
|
||||
"concurrent-ruby"
|
||||
"logger"
|
||||
"rack"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "15rzfzd9dca4v0mr0bbhsbwhygl0k9l24iqqlx0fijig5zfi66wm";
|
||||
sha256 = "1car3fpzhn1l06x2zmanz2l4bj346mv3jcgpcd3p1262y54ml7kn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
};
|
||||
sprockets-helpers = {
|
||||
dependencies = [ "sprockets" ];
|
||||
@@ -572,10 +587,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0";
|
||||
sha256 = "1v74k5yw7ndikr53wgbjn6j51p83qnzqbn9z4b53r102jcx3ri4r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.2";
|
||||
version = "3.1.8";
|
||||
};
|
||||
therubyrhino = {
|
||||
dependencies = [ "therubyrhino_jar" ];
|
||||
@@ -603,10 +618,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96";
|
||||
sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
};
|
||||
tsort = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
twitter-text = {
|
||||
dependencies = [ "unf" ];
|
||||
|
||||
@@ -52,7 +52,7 @@ flutter332.buildFlutterApplication {
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = lib.importJSON ./gitHashes.json;
|
||||
gitHashes = lib.importJSON ./git-hashes.json;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 nix-prefetch-git
|
||||
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
THIS_FOLDER = Path(__file__).parent.resolve()
|
||||
PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
|
||||
GIT_HASHES = THIS_FOLDER / "gitHashes.json"
|
||||
|
||||
|
||||
def fetch_git_hash(url: str, rev: str) -> str:
|
||||
result = subprocess.run(
|
||||
["nix-prefetch-git", "--url", url, "--rev", rev],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=True,
|
||||
)
|
||||
return json.loads(result.stdout)["hash"]
|
||||
|
||||
|
||||
def main() -> None:
|
||||
if not PUBSPEC_LOCK.exists():
|
||||
sys.exit(1)
|
||||
try:
|
||||
data = json.loads(PUBSPEC_LOCK.read_text())
|
||||
except json.JSONDecodeError:
|
||||
sys.exit(1)
|
||||
output: dict[str, str] = {}
|
||||
for name, info in data.get("packages", {}).items():
|
||||
if info.get("source") != "git":
|
||||
continue
|
||||
desc = info.get("description")
|
||||
if not isinstance(desc, dict):
|
||||
continue
|
||||
url = desc.get("url")
|
||||
rev = desc.get("resolved-ref")
|
||||
if not (isinstance(url, str) and isinstance(rev, str)):
|
||||
continue
|
||||
try:
|
||||
package_hash = fetch_git_hash(url, rev)
|
||||
except subprocess.CalledProcessError:
|
||||
continue
|
||||
output[name] = package_hash
|
||||
GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -19,4 +19,5 @@ nix-update gopeed.libgopeed
|
||||
|
||||
curl --fail --silent https://raw.githubusercontent.com/GopeedLab/gopeed/${latestTag}/ui/flutter/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json
|
||||
|
||||
$PACKAGE_DIR/update-gitHashes.py
|
||||
$(nix eval --file . dart.fetchGitHashesScript) --input $PACKAGE_DIR/pubspec.lock.json --output $PACKAGE_DIR/git-hashes.json
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
yq-go,
|
||||
_experimental-update-script-combinators,
|
||||
nix-update-script,
|
||||
dart,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -27,7 +28,7 @@ flutter329.buildFlutterApplication {
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = lib.importJSON ./gitHashes.json;
|
||||
gitHashes = lib.importJSON ./git-hashes.json;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
@@ -74,7 +75,13 @@ flutter329.buildFlutterApplication {
|
||||
}
|
||||
)
|
||||
{
|
||||
command = [ ./update-gitHashes.py ];
|
||||
command = [
|
||||
dart.fetchGitHashesScript
|
||||
"--input"
|
||||
./pubspec.lock.json
|
||||
"--output"
|
||||
./git-hashes.json
|
||||
];
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
];
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 nix-prefetch-git
|
||||
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
THIS_FOLDER = Path(__file__).parent.resolve()
|
||||
PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
|
||||
GIT_HASHES = THIS_FOLDER / "gitHashes.json"
|
||||
|
||||
|
||||
def fetch_git_hash(url: str, rev: str) -> str:
|
||||
result = subprocess.run(
|
||||
["nix-prefetch-git", "--url", url, "--rev", rev],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=True,
|
||||
)
|
||||
return json.loads(result.stdout)["hash"]
|
||||
|
||||
|
||||
def main() -> None:
|
||||
if not PUBSPEC_LOCK.exists():
|
||||
sys.exit(1)
|
||||
try:
|
||||
data = json.loads(PUBSPEC_LOCK.read_text())
|
||||
except json.JSONDecodeError:
|
||||
sys.exit(1)
|
||||
output: dict[str, str] = {}
|
||||
for name, info in data.get("packages", {}).items():
|
||||
if info.get("source") != "git":
|
||||
continue
|
||||
desc = info.get("description")
|
||||
if not isinstance(desc, dict):
|
||||
continue
|
||||
url = desc.get("url")
|
||||
rev = desc.get("resolved-ref")
|
||||
if not (isinstance(url, str) and isinstance(rev, str)):
|
||||
continue
|
||||
try:
|
||||
package_hash = fetch_git_hash(url, rev)
|
||||
except subprocess.CalledProcessError:
|
||||
continue
|
||||
output[name] = package_hash
|
||||
GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "grass";
|
||||
version = "8.4.1";
|
||||
version = "8.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "grass";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k=";
|
||||
hash = "sha256-DEbJZlnq9o+5BYQBXL6wJIVJ9c7HOBLQDMrsiMcaPgk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
fetchzip,
|
||||
lib,
|
||||
rustPlatform,
|
||||
mdbook,
|
||||
git,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
@@ -11,6 +12,10 @@
|
||||
rustPlatform.buildRustPackage (final: {
|
||||
pname = "helix";
|
||||
version = "25.07.1";
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
];
|
||||
|
||||
# This release tarball includes source code for the tree-sitter grammars,
|
||||
# which is not ordinarily part of the repository.
|
||||
@@ -25,20 +30,26 @@ rustPlatform.buildRustPackage (final: {
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
installShellFiles
|
||||
mdbook
|
||||
];
|
||||
|
||||
env.HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime";
|
||||
|
||||
postBuild = ''
|
||||
mdbook build book -d ../book-html
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# not needed at runtime
|
||||
rm -r runtime/grammars/sources
|
||||
|
||||
mkdir -p $out/lib
|
||||
mkdir -p $out/lib $doc/share/doc
|
||||
cp -r runtime $out/lib
|
||||
installShellCompletion contrib/completion/hx.{bash,fish,zsh}
|
||||
mkdir -p $out/share/{applications,icons/hicolor/256x256/apps}
|
||||
cp contrib/Helix.desktop $out/share/applications
|
||||
cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
|
||||
cp -r book-html $doc/share/doc/$name
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
|
||||
+8796
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "i18next-cli";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i18next";
|
||||
repo = "i18next-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jidpGVdyi7slFAY1nwbhFx8QCZQ+VKgWybpQudY4zIM=";
|
||||
};
|
||||
|
||||
# NOTE: Generating lock-file
|
||||
# npm install --package-lock-only
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-9WsQEDeVsNl4XRN5CPbqdHZihPJmNT3LaEmuTOksyBo=";
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--generate-lockfile" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A unified, high-performance i18next CLI";
|
||||
changelog = "https://github.com/i18next/i18next-cli/releases/tag/v${version}";
|
||||
homepage = "https://www.locize.com/blog/i18next-cli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.pbek ];
|
||||
mainProgram = "i18next-cli";
|
||||
};
|
||||
}
|
||||
@@ -28,21 +28,20 @@
|
||||
let
|
||||
rootSrc = stdenv.mkDerivation {
|
||||
pname = "iEDA-src";
|
||||
version = "2025-09-10";
|
||||
version = "2025-11-08";
|
||||
src = fetchgit {
|
||||
url = "https://gitee.com/oscc-project/iEDA";
|
||||
rev = "614a91b4d18ba7dc561315f2d5fdae4a5451f486";
|
||||
sha256 = "sha256-xn1hpnSyO+jauYYhlsKjBkkD3RJ1GqbHtnWRe/My1R0=";
|
||||
rev = "038eb6454cb7e83c6b65b933e8a21b3e4b4776e0";
|
||||
sha256 = "sha256-wUqpiCU5ap6oda2ReHtUBwI0XMEUcuXY7qWNQ2UlL9A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch is to fix the build error caused by the missing of the header file,
|
||||
# and remove some libs or path that they hard-coded in the source code.
|
||||
# This patch is to fix the build system to properly find and link against rust libraries.
|
||||
# Due to the way they organized the source code, it's hard to upstream this patch.
|
||||
# So we have to maintain this patch locally.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Emin017/iEDA/commit/c6b642f3db6c156eaf4f1203612592c86e49e1b5.patch";
|
||||
hash = "sha256-L0bmW7kadmLLng9rZOT1NpvniBpuD8SUqCfeH2cCrdg=";
|
||||
url = "https://github.com/Emin017/iEDA/commit/e5f3ce024965df5e1d400b6a1d7f8b5b307a4bf3.patch";
|
||||
hash = "sha256-YJnY+r9A887WT0a/H/Zf++r1PpD7t567NpkesDmIsD0=";
|
||||
})
|
||||
# Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux
|
||||
(fetchpatch {
|
||||
@@ -66,7 +65,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "iEDA";
|
||||
version = "0.1.0-unstable-2025-09-10";
|
||||
version = "0.1.0-unstable-2025-11-08";
|
||||
|
||||
src = rootSrc;
|
||||
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "infat";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "philocalyst";
|
||||
repo = "infat";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M0A9/rjw5aX4yfkEzkczLcvMpMuVTV5u1eyKhlM7nNk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8WE9TiZX1QWenjEQF/uhzJ8Gqbggt8B9EZ+1tzWq72Q=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Command line tool to set default openers for file formats and url schemes on macOS";
|
||||
homepage = "https://github.com/philocalyst/infat";
|
||||
changelog = "https://github.com/philocalyst/infat/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
mirkolenz
|
||||
];
|
||||
mainProgram = "infat";
|
||||
};
|
||||
})
|
||||
@@ -127,14 +127,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dhtnet = stdenv.mkDerivation {
|
||||
pname = "dhtnet";
|
||||
version = "unstable-2025-09-15";
|
||||
version = "unstable-2025-11-10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.jami.net";
|
||||
owner = "savoirfairelinux";
|
||||
repo = "dhtnet";
|
||||
rev = "7861b4620b4cec5fa34c5d1bb2b304912730f638";
|
||||
hash = "sha256-nhGB4u12Ubmc7lLVOAwycRsP+cWzn4A9bYH0+sSBQTg=";
|
||||
rev = "03c6ce608daf906fc98b82f114b61ebfdeae5dc6";
|
||||
hash = "sha256-VTciKJ1IYtQopdV/TpnuB3T2tipcQjjKDlh2cKGDtRQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,22 +8,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jellyfin-rpc";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Radiicall";
|
||||
repo = "jellyfin-rpc";
|
||||
tag = version;
|
||||
hash = "sha256-zKqP6Wt38ckqCPDS1oncmx92lZJm2oeb3bfpwVc6fUc=";
|
||||
hash = "sha256-g4Vd++Q6rJS6nU1kR+7aItnhHc0jeFSU460iF6P1EEk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-k9dGz+1HGcQoDMyqmJ1hEYklfYHibo1PI5jHEe0mr+w=";
|
||||
cargoHash = "sha256-ltEm3hFiHBM4NtYg1qrFH26jMDgWa+al06P6O/Su1XA=";
|
||||
|
||||
# TODO: Re-enable when upstream bumps the version number internally
|
||||
# nativeInstallCheckInputs = [
|
||||
# versionCheckHook
|
||||
# ];
|
||||
# doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
pname = "jetbrains-toolbox";
|
||||
version = "3.0.1.59888";
|
||||
version = "3.1.0.62320";
|
||||
|
||||
updateScript = ./update.sh;
|
||||
|
||||
@@ -55,10 +55,10 @@ let
|
||||
aarch64 = "-arm64";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-+rSjKr/MF6WbRkXeCvxzepThiDleYdtqQmX8rfJinNs=";
|
||||
aarch64-linux = "sha256-Zt3OqnQhiK8nWrKYWFuQ10oc5SZJbhrLpGY5P0QcbBw=";
|
||||
x86_64-darwin = "sha256-Lbq+buoulHmLBNOm23yDBoodPPOOOfF/FfkdGEOh/N4=";
|
||||
aarch64-darwin = "sha256-jaLddShsw/lDIICAa8RZFhOoWJ7hx9gfRFwxy1t6sVc=";
|
||||
x86_64-linux = "sha256-Fmnj1mYMpsiBpnERiWPAwQaH7qLqkrTICn0mxX0h+2U=";
|
||||
aarch64-linux = "sha256-ogLaPN9nxZFQ09qmIF2mEi5o9LVgjoGtmYclc6KmrNU=";
|
||||
x86_64-darwin = "sha256-hO5J9I8ZrzsgGtb9dMg2SeI/PrxpkFRjDRUdrjqMnPw=";
|
||||
aarch64-darwin = "sha256-xA0LbwDKR6/64K9uUJHvrPC+0mRLGM/axz8+Knc+X8A=";
|
||||
};
|
||||
in
|
||||
selectKernel {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
jre,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jive";
|
||||
version = "7.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.maven.apache.org/maven2/org/tango-controls/Jive/${version}/Jive-${version}-jar-with-dependencies.jar";
|
||||
hash = "sha256-a/I4jMlTVYWN9zNBQnWbvT2MBHItexnwPly1XyOeR8U=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/java
|
||||
cp $src $out/share/java/jive.jar
|
||||
makeWrapper ${jre}/bin/java $out/bin/jive \
|
||||
--add-flags "-classpath $out/share/java/jive.jar jive3.MainPanel"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Standalone JAVA application designed to browse and edit the static TANGO database";
|
||||
homepage = "https://gitlab.com/tango-controls/jive";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.gilice ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
};
|
||||
}
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jjui";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QaAjxpn7VHUdL8PFQcDUsa7xA/7bMtGaGl1aTpKOs2M=";
|
||||
hash = "sha256-sLOQa9IoRcYEXcShiE/vdjJknQcDwefVwHii63MPXpw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YBRHpHBb3uzgXhwxVu3493CtPyG9Vzm8IPc1VW6/CKU=";
|
||||
vendorHash = "sha256-SMeS1FHc8UdXaxF9A8eYFkWQIM0hgWfBpuX+DsBglcw=";
|
||||
|
||||
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
|
||||
|
||||
|
||||
@@ -11,9 +11,10 @@
|
||||
mpv-unwrapped,
|
||||
webkitgtk_4_1,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
nix-update-script,
|
||||
runCommand,
|
||||
yq-go,
|
||||
dart,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -32,7 +33,7 @@ flutter338.buildFlutterApplication {
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = lib.importJSON ./gitHashes.json;
|
||||
gitHashes = lib.importJSON ./git-hashes.json;
|
||||
|
||||
customSourceBuilders = {
|
||||
# unofficial media_kit_libs_linux
|
||||
@@ -114,11 +115,22 @@ flutter338.buildFlutterApplication {
|
||||
yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater { })
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "kazumi.pubspecSource" ./pubspec.lock.json)
|
||||
(nix-update-script { })
|
||||
(
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "kazumi.pubspecSource" ./pubspec.lock.json)
|
||||
// {
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
)
|
||||
{
|
||||
command = [ ./update-gitHashes.py ];
|
||||
supportedFeatures = [ "silent" ];
|
||||
command = [
|
||||
dart.fetchGitHashesScript
|
||||
"--input"
|
||||
./pubspec.lock.json
|
||||
"--output"
|
||||
./git-hashes.json
|
||||
];
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 nix-prefetch-git
|
||||
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
THIS_FOLDER = Path(__file__).parent.resolve()
|
||||
PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
|
||||
GIT_HASHES = THIS_FOLDER / "gitHashes.json"
|
||||
|
||||
|
||||
def fetch_git_hash(url: str, rev: str) -> str:
|
||||
result = subprocess.run(
|
||||
["nix-prefetch-git", "--url", url, "--rev", rev],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=True,
|
||||
)
|
||||
return json.loads(result.stdout)["hash"]
|
||||
|
||||
|
||||
def main() -> None:
|
||||
if not PUBSPEC_LOCK.exists():
|
||||
sys.exit(1)
|
||||
try:
|
||||
data = json.loads(PUBSPEC_LOCK.read_text())
|
||||
except json.JSONDecodeError:
|
||||
sys.exit(1)
|
||||
output: dict[str, str] = {}
|
||||
for name, info in data.get("packages", {}).items():
|
||||
if info.get("source") != "git":
|
||||
continue
|
||||
desc = info.get("description")
|
||||
if not isinstance(desc, dict):
|
||||
continue
|
||||
url = desc.get("url")
|
||||
rev = desc.get("resolved-ref")
|
||||
if not (isinstance(url, str) and isinstance(rev, str)):
|
||||
continue
|
||||
try:
|
||||
package_hash = fetch_git_hash(url, rev)
|
||||
except subprocess.CalledProcessError:
|
||||
continue
|
||||
output[name] = package_hash
|
||||
GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -10,12 +10,12 @@
|
||||
kopia,
|
||||
}:
|
||||
let
|
||||
version = "0.21.1";
|
||||
version = "0.22.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kopia";
|
||||
repo = "kopia";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0i8bKah3a7MrgzATysgFCsmDZxK9qH+4hmBMW+GR9/4=";
|
||||
hash = "sha256-5ItNevLcZhAsYgxdJd2u62z9NkKyYUojWcRQgk/NTmU=";
|
||||
};
|
||||
in
|
||||
buildNpmPackage {
|
||||
@@ -24,7 +24,7 @@ buildNpmPackage {
|
||||
|
||||
sourceRoot = "${src.name}/app";
|
||||
|
||||
npmDepsHash = "sha256-IoPR3es5rHVOxITYCG5I3ETB/KKh5Ku8ftyR9uQH//8=";
|
||||
npmDepsHash = "sha256-DRsPiIiikp0pCAo0np0E3TYT1L6HGKXAXwKuB1jX6lw=";
|
||||
makeCacheWritable = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo124Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo124Module rec {
|
||||
pname = "legitify";
|
||||
version = "1.0.11";
|
||||
|
||||
@@ -30,7 +30,7 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets";
|
||||
homepage = "https://github.com/Legit-Labs/legitify";
|
||||
changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "legitify";
|
||||
|
||||
@@ -1,58 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
which,
|
||||
pkg-config,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
gettext,
|
||||
openssl,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
gettext,
|
||||
meson,
|
||||
ninja,
|
||||
openssl,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lib3270";
|
||||
version = "5.4";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PerryWerneck";
|
||||
repo = "lib3270";
|
||||
rev = version;
|
||||
hash = "sha256-w6Bg+TvSDAuZwtu/nyAIuq6pgheM5nXtfuryECfnKng=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AGS7RkMeVKe2Ed5Aj3oHdbiGMoYGmq2Wlkcd4wSm4J8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
gettext
|
||||
openssl
|
||||
curl
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Patch the required version.
|
||||
sed -i -e "s/20211118/19800101/" src/core/session.c
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 sh autogen.sh
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "TN3270 client Library";
|
||||
homepage = "https://github.com/PerryWerneck/lib3270";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = [ maintainers.vifino ];
|
||||
changelog = "https://github.com/PerryWerneck/lib3270/blob/${finalAttrs.version}/CHANGELOG";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ vifino ];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user