Merge staging-next into staging
This commit is contained in:
@@ -177,7 +177,7 @@ Finally, there are some plugins that are also packaged in nodePackages because t
|
||||
Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token).
|
||||
|
||||
```sh
|
||||
nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --github-token=mytoken' # or set GITHUB_API_TOKEN environment variable
|
||||
nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --github-token=mytoken' # or set GITHUB_TOKEN environment variable
|
||||
```
|
||||
|
||||
Alternatively, set the number of processes to a lower count to avoid rate-limiting.
|
||||
|
||||
@@ -24614,6 +24614,11 @@
|
||||
githubId = 1220572;
|
||||
name = "Christian Theune";
|
||||
};
|
||||
theverygaming = {
|
||||
name = "theverygaming";
|
||||
github = "theverygaming";
|
||||
githubId = 18639279;
|
||||
};
|
||||
thiagokokada = {
|
||||
email = "thiagokokada@gmail.com";
|
||||
github = "thiagokokada";
|
||||
|
||||
@@ -558,7 +558,16 @@ class Editor:
|
||||
}
|
||||
|
||||
for plugin_desc, plugin, redirect in fetched:
|
||||
result[plugin.normalized_name] = (plugin_desc, plugin, redirect)
|
||||
# Check if plugin is a Plugin object and has normalized_name attribute
|
||||
if isinstance(plugin, Plugin) and hasattr(plugin, 'normalized_name'):
|
||||
result[plugin.normalized_name] = (plugin_desc, plugin, redirect)
|
||||
elif isinstance(plugin, Exception):
|
||||
# For exceptions, we can't determine the normalized_name
|
||||
# Just log the error and continue
|
||||
log.error(f"Error fetching plugin {plugin_desc.name}: {plugin!r}")
|
||||
else:
|
||||
# For unexpected types, log the issue
|
||||
log.error(f"Unexpected plugin type for {plugin_desc.name}: {type(plugin)}")
|
||||
|
||||
return list(result.values())
|
||||
|
||||
@@ -615,9 +624,9 @@ class Editor:
|
||||
"--github-token",
|
||||
"-t",
|
||||
type=str,
|
||||
default=os.getenv("GITHUB_API_TOKEN"),
|
||||
default=os.getenv("GITHUB_TOKEN"),
|
||||
help="""Allows to set --proc to higher values.
|
||||
Uses GITHUB_API_TOKEN environment variables as the default value.""",
|
||||
Uses GITHUB_TOKEN environment variables as the default value.""",
|
||||
)
|
||||
common.add_argument(
|
||||
"--no-commit",
|
||||
|
||||
@@ -22,4 +22,4 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- `services.clamsmtp` is unmaintained and was removed from Nixpkgs.
|
||||
|
||||
@@ -713,7 +713,6 @@
|
||||
./services/logging/ulogd.nix
|
||||
./services/logging/vector.nix
|
||||
./services/mail/automx2.nix
|
||||
./services/mail/clamsmtp.nix
|
||||
./services/mail/cyrus-imap.nix
|
||||
./services/mail/davmail.nix
|
||||
./services/mail/dkimproxy-out.nix
|
||||
|
||||
@@ -102,6 +102,10 @@ in
|
||||
"services"
|
||||
"chronos"
|
||||
] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [
|
||||
"services"
|
||||
"clamsmtp"
|
||||
] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "confluence" ]
|
||||
"Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"
|
||||
)
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.clamsmtp;
|
||||
clamdSocket = "/run/clamav/clamd.ctl"; # See services/security/clamav.nix
|
||||
in
|
||||
{
|
||||
##### interface
|
||||
options = {
|
||||
services.clamsmtp = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to enable clamsmtp.";
|
||||
};
|
||||
|
||||
instances = lib.mkOption {
|
||||
description = "Instances of clamsmtp to run.";
|
||||
type = lib.types.listOf (
|
||||
lib.types.submodule {
|
||||
options = {
|
||||
action = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"bounce"
|
||||
"drop"
|
||||
"pass"
|
||||
];
|
||||
default = "drop";
|
||||
description = ''
|
||||
Action to take when a virus is detected.
|
||||
|
||||
Note that viruses often spoof sender addresses, so bouncing is
|
||||
in most cases not a good idea.
|
||||
'';
|
||||
};
|
||||
|
||||
header = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
example = "X-Virus-Scanned: ClamAV using ClamSMTP";
|
||||
description = ''
|
||||
A header to add to scanned messages. See {manpage}`clamsmtpd.conf(5)` for
|
||||
more details. Empty means no header.
|
||||
'';
|
||||
};
|
||||
|
||||
keepAlives = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 0;
|
||||
description = ''
|
||||
Number of seconds to wait between each NOOP sent to the sending
|
||||
server. 0 to disable.
|
||||
|
||||
This is meant for slow servers where the sending MTA times out
|
||||
waiting for clamd to scan the file.
|
||||
'';
|
||||
};
|
||||
|
||||
listen = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "127.0.0.1:10025";
|
||||
description = ''
|
||||
Address to wait for incoming SMTP connections on. See
|
||||
{manpage}`clamsmtpd.conf(5)` for more details.
|
||||
'';
|
||||
};
|
||||
|
||||
quarantine = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to quarantine files that contain viruses by leaving them
|
||||
in the temporary directory.
|
||||
'';
|
||||
};
|
||||
|
||||
maxConnections = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 64;
|
||||
description = "Maximum number of connections to accept at once.";
|
||||
};
|
||||
|
||||
outAddress = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
Address of the SMTP server to send email to once it has been
|
||||
scanned.
|
||||
'';
|
||||
};
|
||||
|
||||
tempDirectory = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/tmp";
|
||||
description = ''
|
||||
Temporary directory that needs to be accessible to both clamd
|
||||
and clamsmtpd.
|
||||
'';
|
||||
};
|
||||
|
||||
timeout = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 180;
|
||||
description = "Time-out for network connections.";
|
||||
};
|
||||
|
||||
transparentProxy = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable clamsmtp's transparent proxy support.";
|
||||
};
|
||||
|
||||
virusAction = lib.mkOption {
|
||||
type = with lib.types; nullOr path;
|
||||
default = null;
|
||||
description = ''
|
||||
Command to run when a virus is found. Please see VIRUS ACTION in
|
||||
{manpage}`clamsmtpd(8)` for a discussion of this option and its safe use.
|
||||
'';
|
||||
};
|
||||
|
||||
xClient = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Send the XCLIENT command to the receiving server, for forwarding
|
||||
client addresses and connection information if the receiving
|
||||
server supports this feature.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
##### implementation
|
||||
config =
|
||||
let
|
||||
configfile =
|
||||
conf:
|
||||
pkgs.writeText "clamsmtpd.conf" ''
|
||||
Action: ${conf.action}
|
||||
ClamAddress: ${clamdSocket}
|
||||
Header: ${conf.header}
|
||||
KeepAlives: ${toString conf.keepAlives}
|
||||
Listen: ${conf.listen}
|
||||
Quarantine: ${if conf.quarantine then "on" else "off"}
|
||||
MaxConnections: ${toString conf.maxConnections}
|
||||
OutAddress: ${conf.outAddress}
|
||||
TempDirectory: ${conf.tempDirectory}
|
||||
TimeOut: ${toString conf.timeout}
|
||||
TransparentProxy: ${if conf.transparentProxy then "on" else "off"}
|
||||
User: clamav
|
||||
${lib.optionalString (conf.virusAction != null) "VirusAction: ${conf.virusAction}"}
|
||||
XClient: ${if conf.xClient then "on" else "off"}
|
||||
'';
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.services.clamav.daemon.enable;
|
||||
message = "clamsmtp requires clamav to be enabled";
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services = lib.listToAttrs (
|
||||
lib.imap1 (
|
||||
i: conf:
|
||||
lib.nameValuePair "clamsmtp-${toString i}" {
|
||||
description = "ClamSMTP instance ${toString i}";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = "exec ${pkgs.clamsmtp}/bin/clamsmtpd -f ${configfile conf}";
|
||||
after = [ "clamav-daemon.service" ];
|
||||
requires = [ "clamav-daemon.service" ];
|
||||
serviceConfig.Type = "forking";
|
||||
serviceConfig.PrivateTmp = "yes";
|
||||
unitConfig.JoinsNamespaceOf = "clamav-daemon.service";
|
||||
}
|
||||
) cfg.instances
|
||||
);
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ ekleog ];
|
||||
}
|
||||
@@ -121,11 +121,27 @@ in
|
||||
}
|
||||
);
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/spool/smtpd 711 root - - -"
|
||||
"d /var/spool/smtpd/offline 770 root smtpq - -"
|
||||
"d /var/spool/smtpd/purge 700 smtpq root - -"
|
||||
];
|
||||
systemd.tmpfiles.settings.opensmtpd = {
|
||||
"/var/spool/smtpd".d = {
|
||||
mode = "0711";
|
||||
user = "root";
|
||||
};
|
||||
"/var/spool/smtpd/offline".d = {
|
||||
mode = "0770";
|
||||
user = "root";
|
||||
group = "smtpq";
|
||||
};
|
||||
"/var/spool/smtpd/purge".d = {
|
||||
mode = "0700";
|
||||
user = "smtpq";
|
||||
group = "root";
|
||||
};
|
||||
"/var/spool/smtpd/queue".d = {
|
||||
mode = "0700";
|
||||
user = "smtpq";
|
||||
group = "root";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.opensmtpd =
|
||||
let
|
||||
|
||||
@@ -14,4 +14,9 @@
|
||||
# Don't use a desktop manager.
|
||||
services.displayManager.defaultSession = lib.mkDefault "none+icewm";
|
||||
services.xserver.windowManager.icewm.enable = true;
|
||||
|
||||
# Help with OCR
|
||||
environment.etc."icewm/theme".text = ''
|
||||
Theme="gtk2/default.theme"
|
||||
'';
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,19 +5,16 @@
|
||||
with pkgs;
|
||||
|
||||
let
|
||||
inherit (vimPlugins) nvim-treesitter;
|
||||
|
||||
neovim = pkgs.neovim.override {
|
||||
configure.packages.all.start = [ nvim-treesitter ];
|
||||
};
|
||||
pythonWithPackages = python3.withPackages (
|
||||
ps: with ps; [
|
||||
requests
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
mkShell {
|
||||
packages = [
|
||||
neovim
|
||||
nurl
|
||||
python3
|
||||
pythonWithPackages
|
||||
];
|
||||
|
||||
NVIM_TREESITTER = nvim-treesitter;
|
||||
}
|
||||
|
||||
@@ -5,104 +5,128 @@ import json
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
|
||||
import requests
|
||||
|
||||
log = logging.getLogger("vim-updater")
|
||||
|
||||
NURR_JSON_URL = "https://raw.githubusercontent.com/nvim-neorocks/nurr/main/tree-sitter-parsers.json"
|
||||
|
||||
def generate_grammar(lang, rev, cfg):
|
||||
"""Generate grammar for a language"""
|
||||
info = cfg["install_info"]
|
||||
url = info["url"]
|
||||
def generate_grammar(lang, parser_info):
|
||||
"""Generate grammar for a language based on the parser info"""
|
||||
try:
|
||||
if "install_info" not in parser_info:
|
||||
log.warning(f"Parser {lang} does not have install_info, skipping")
|
||||
return ""
|
||||
|
||||
generated = f""" {lang} = buildGrammar {{
|
||||
install_info = parser_info["install_info"]
|
||||
|
||||
url = install_info["url"]
|
||||
rev = install_info["revision"]
|
||||
|
||||
generated = f""" {lang} = buildGrammar {{
|
||||
language = "{lang}";
|
||||
version = "0.0.0+rev={rev[:7]}";
|
||||
src = """
|
||||
|
||||
generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True)
|
||||
generated += ";"
|
||||
generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True)
|
||||
generated += ";"
|
||||
|
||||
location = info.get("location")
|
||||
if location:
|
||||
generated += f"""
|
||||
location = install_info.get("location", "")
|
||||
if location:
|
||||
generated += f"""
|
||||
location = "{location}";"""
|
||||
|
||||
if info.get("requires_generate_from_grammar"):
|
||||
generated += """
|
||||
if install_info.get("generate", False):
|
||||
generated += """
|
||||
generate = true;"""
|
||||
|
||||
generated += f"""
|
||||
generated += f"""
|
||||
meta.homepage = "{url}";
|
||||
}};
|
||||
"""
|
||||
|
||||
return generated
|
||||
return generated
|
||||
except Exception as e:
|
||||
log.error(f"Error generating grammar for {lang}: {e}")
|
||||
return ""
|
||||
|
||||
|
||||
def update_grammars(nvim_treesitter_dir: str):
|
||||
"""
|
||||
The lockfile contains just revisions so we start neovim to dump the
|
||||
grammar information in a better format
|
||||
"""
|
||||
# the lockfile
|
||||
cmd = [
|
||||
"nvim",
|
||||
"--headless",
|
||||
"-u",
|
||||
"NONE",
|
||||
"--cmd",
|
||||
f"set rtp^={nvim_treesitter_dir}",
|
||||
"+lua io.write(vim.json.encode(require('nvim-treesitter.parsers').get_parser_configs()))",
|
||||
"+quit!",
|
||||
]
|
||||
log.debug("Running command: %s", ' '.join(cmd))
|
||||
configs = json.loads(subprocess.check_output(cmd))
|
||||
def fetch_nurr_parsers():
|
||||
"""Fetch the parser information from nurr repository"""
|
||||
log.info("Fetching parser data from %s", NURR_JSON_URL)
|
||||
|
||||
headers = {}
|
||||
github_token = os.environ.get("GITHUB_TOKEN")
|
||||
if github_token:
|
||||
log.info("Using GITHUB_TOKEN for authentication")
|
||||
headers["Authorization"] = f"token {github_token}"
|
||||
else:
|
||||
log.warning("No GITHUB_TOKEN found. GitHub API requests may be rate-limited.")
|
||||
|
||||
response = requests.get(NURR_JSON_URL, headers=headers, timeout=30)
|
||||
response.raise_for_status()
|
||||
data = response.json()
|
||||
|
||||
try:
|
||||
parsers = data["parsers"]
|
||||
except KeyError:
|
||||
raise ValueError(
|
||||
"Unexpected response from NURR:\n" + json.dumps(data, indent=2)
|
||||
)
|
||||
log.info(f"Successfully fetched {len(parsers)} parsers")
|
||||
return parsers
|
||||
|
||||
|
||||
def process_parser_info(parser_info):
|
||||
"""Process a single parser info entry and generate grammar for it"""
|
||||
try:
|
||||
lang = parser_info["lang"]
|
||||
return generate_grammar(lang, parser_info)
|
||||
except Exception as e:
|
||||
log.error(f"Error processing parser: {e}")
|
||||
return ""
|
||||
|
||||
|
||||
def update_grammars():
|
||||
"""Update grammar definitions using nurr's parser information"""
|
||||
parsers_info = fetch_nurr_parsers()
|
||||
|
||||
generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
|
||||
# Using parser data from https://github.com/nvim-neorocks/nurr/blob/main/tree-sitter-parsers.json
|
||||
|
||||
{
|
||||
buildGrammar,
|
||||
"""
|
||||
|
||||
# Get the output and format it properly
|
||||
nurl_output = subprocess.check_output(["nurl", "-Ls", ","], text=True).strip()
|
||||
# Add proper indentation (2 spaces) to the comma-separated list
|
||||
indented_output = nurl_output.replace(",", ",\n ")
|
||||
generated_file += indented_output
|
||||
|
||||
generated_file += """,
|
||||
}:
|
||||
|
||||
{
|
||||
"""
|
||||
|
||||
lockfile_path = os.path.join(nvim_treesitter_dir, "lockfile.json")
|
||||
log.debug("Opening %s", lockfile_path)
|
||||
with open(lockfile_path) as lockfile_fd:
|
||||
lockfile = json.load(lockfile_fd)
|
||||
|
||||
def _generate_grammar(item):
|
||||
lang, lock = item
|
||||
cfg = configs.get(lang)
|
||||
if not cfg:
|
||||
return ""
|
||||
return generate_grammar(lang, lock["revision"], cfg)
|
||||
|
||||
for generated in ThreadPoolExecutor(max_workers=5).map(
|
||||
_generate_grammar, lockfile.items()
|
||||
):
|
||||
# Process parsers in parallel for better performance
|
||||
with ThreadPoolExecutor(max_workers=5) as executor:
|
||||
for generated in executor.map(process_parser_info, parsers_info):
|
||||
generated_file += generated
|
||||
|
||||
generated_file += "}\n"
|
||||
generated_file += "}\n"
|
||||
return generated_file
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
generated = update_grammars(sys.argv[1])
|
||||
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
|
||||
|
||||
generated = update_grammars()
|
||||
output_path = os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
"../../nvim-treesitter/generated.nix"
|
||||
)
|
||||
open(output_path, "w").write(generated)
|
||||
log.info("Writing output to %s", output_path)
|
||||
with open(output_path, "w") as f:
|
||||
f.write(generated)
|
||||
log.info("Successfully updated grammar definitions")
|
||||
|
||||
@@ -19,10 +19,8 @@
|
||||
#
|
||||
|
||||
import inspect
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import textwrap
|
||||
from pathlib import Path
|
||||
from typing import List, Tuple
|
||||
@@ -136,20 +134,7 @@ class VimEditor(pluginupdate.Editor):
|
||||
# TODO this should probably be skipped when running outside a nixpkgs checkout
|
||||
if self.nvim_treesitter_updated:
|
||||
print("updating nvim-treesitter grammars")
|
||||
cmd = [
|
||||
"nix",
|
||||
"build",
|
||||
"vimPlugins.nvim-treesitter.src",
|
||||
"-f",
|
||||
self.nixpkgs,
|
||||
"--print-out-paths",
|
||||
]
|
||||
log.debug("Running command: %s", " ".join(cmd))
|
||||
nvim_treesitter_dir = subprocess.check_output(
|
||||
cmd, text=True, timeout=90
|
||||
).strip()
|
||||
|
||||
generated = treesitter.update_grammars(nvim_treesitter_dir)
|
||||
generated = treesitter.update_grammars()
|
||||
treesitter_generated_nix_path = os.path.join(
|
||||
NIXPKGS_NVIMTREESITTER_FOLDER, "generated.nix"
|
||||
)
|
||||
|
||||
@@ -25,6 +25,7 @@ buildPythonApplication {
|
||||
|
||||
pythonPath = [
|
||||
python3Packages.gitpython
|
||||
python3Packages.requests
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "calva";
|
||||
publisher = "betterthantomorrow";
|
||||
version = "2.0.509";
|
||||
hash = "sha256-4OTgwzLG21W3BR3EhepzhCwTnBmhDsoQ5GWN00kZqCY=";
|
||||
version = "2.0.512";
|
||||
hash = "sha256-JGk3TXeJhDMoPOVrDgxlNCAX0YCcaU7+ww2m6bPxnwo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1181,8 +1181,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-database-client2";
|
||||
publisher = "cweijan";
|
||||
version = "8.3.1";
|
||||
hash = "sha256-SLZkuWChkNt4+99kAauDx3Dz3wjnYEfTsFFH/i6ugeo=";
|
||||
version = "8.3.2";
|
||||
hash = "sha256-cBFc8F8FwP7rSWyRTZqi19MihwHE6xNpb4I4O+4zhWs=";
|
||||
};
|
||||
meta = {
|
||||
description = "Database Client For Visual Studio Code";
|
||||
@@ -3949,8 +3949,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
publisher = "Prisma";
|
||||
version = "6.7.1";
|
||||
hash = "sha256-qgWCC2aIUGS8XG9E8Z9Ya2BGBmL8RwRcHNdbJJFvPws=";
|
||||
version = "6.8.2";
|
||||
hash = "sha256-jortg6SQId1373+4p3Tbej2Q1oz2UhUf+o8xb4PmOVM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
|
||||
@@ -4387,8 +4387,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "shopify";
|
||||
name = "ruby-lsp";
|
||||
version = "0.9.23";
|
||||
hash = "sha256-toCxWCMun+siVVXH6tjfe71XeAoXyEBiRRR0ViaMDUw=";
|
||||
version = "0.9.24";
|
||||
hash = "sha256-nlPqdn7tOQhr4Z/8N0aHAnkqKtYrpQCzwRGsseT8K5g=";
|
||||
};
|
||||
meta = {
|
||||
description = "VS Code plugin for connecting with the Ruby LSP";
|
||||
@@ -4675,8 +4675,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "svelte-vscode";
|
||||
publisher = "svelte";
|
||||
version = "109.6.0";
|
||||
hash = "sha256-oyeVtOcTqvcIhG+mq0TmQyOZcp7fENCpy3M7bkaP+N4=";
|
||||
version = "109.8.0";
|
||||
hash = "sha256-T0pNjjeKKX/T1Oc+zvOHu74H4r4F9Ogk5gDV7z0+D9I=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/sveltejs/language-tools/releases";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.15.1";
|
||||
hash = "sha256-VuUvxLiPbdpBko3h/FFc1/kYUdUvy7f/euN+Js/Hp4I=";
|
||||
version = "3.16.1";
|
||||
hash = "sha256-o8sU4daSeaq6x24mGcBW84Z0SwLu76hZWA9ihlYlT1w=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -31,11 +31,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "skrooge";
|
||||
version = "25.1.0";
|
||||
version = "25.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz";
|
||||
hash = "sha256-t8A9egotR2XoMBo5uoH2RBPEo3H6nPSJS5Oi4MkSVww=";
|
||||
hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aespipe";
|
||||
version = "2.4h";
|
||||
version = "2.4i";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2";
|
||||
sha256 = "sha256-6rMR/CbqQyibw632YNYnBJJJSWByXSAm7EkXKUoaukk=";
|
||||
sha256 = "sha256-tBx6qsJULlnY/1jB/52HtS1KjBhHt5nIr+yR2UUXx14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -38,16 +38,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo-workflows";
|
||||
version = "3.6.5";
|
||||
version = "3.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LvFpYVylVwWhoVtMDldalSHa5KGdbKVB6yFnP5ha4gg=";
|
||||
hash = "sha256-LV6Pg+RFVFNwh6rmlHgqwcu99tse9wW3nBHpj4zYdrU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hMegxeUFSBf32dnXmD7QagkvWgWDeB4Fu4nlKNoePWY=";
|
||||
vendorHash = "sha256-jYVwIHqArsF3pHKnCuyO2OMhEhutAsiq91iBh+KqerA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.73";
|
||||
version = "2.0.75";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QVWfdeGYMW/BKzgQD191vmEaRZLWi2QOtuOdDyQgwf8=";
|
||||
sha256 = "sha256-DEHnMgHJTpf2t7iqaYC7AvG8Su4dTCCalnEwP75T8rA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-E3qnOMiyPGMXCldmRQVEQVssx7aRHddVPQzt5B+i4Ko=";
|
||||
cargoHash = "sha256-b6f6BDIPygXvXKEXxzy2KW/khk5RuUIhgBfcB30IqQc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calls";
|
||||
version = "47.0";
|
||||
version = "48.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
repo = "calls";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-HzQz5jmlXwUHLXC6nhHCa8E8zczaA89YxteZgxSV0YY=";
|
||||
hash = "sha256-JK+bG/5p+c37aP7ZTGiPDh8tBHgWsuFkD7AsyZXePaw=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -3,27 +3,36 @@
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
|
||||
withRoundedCorners ? false,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "catppuccin-fcitx5";
|
||||
version = "0-unstable-2025-03-22";
|
||||
version = "0-unstable-2025-05-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "fcitx5";
|
||||
rev = "383c27ac46cbb55aa5f58acbd32841c1ed3a78a0";
|
||||
hash = "sha256-n83f9ge4UhBFlgCPRCXygcVJiDp7st48lAJHTm1ohR4=";
|
||||
rev = "393845cf3ed0e0000bfe57fe1b9ad75748e2547f";
|
||||
hash = "sha256-ss0kW+ulvMhxeZKBrjQ7E5Cya+02eJrGsE4OLEkqKks=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/fcitx5
|
||||
cp -r src $out/share/fcitx5/themes
|
||||
runHook postInstall
|
||||
'';
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString withRoundedCorners ''
|
||||
find src -name theme.conf -exec sed -iE 's/^# (Image=(panel|highlight).svg)/\1/' {} +
|
||||
''
|
||||
+ ''
|
||||
mkdir -p $out/share/fcitx5
|
||||
cp -r src $out/share/fcitx5/themes
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cedar";
|
||||
version = "4.3.3";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cedar-policy";
|
||||
repo = "cedar";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-o4oSZcQdOQsCbu92w0jY/EQKGtQis+8tUxaLIqVC1po=";
|
||||
hash = "sha256-rF6r7BUwjRYK9MM0owLs77i7duNj710+PHoX1LGDO24=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-1vEI0dtdb9CKhNvFeBL8KdxSfzF77X7zl1xxpvvRCQk=";
|
||||
cargoHash = "sha256-6SvXJc7ow0zhCPqrI15n05FUBZOmYDnqV4YSclkTZ9I=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = cedar; };
|
||||
|
||||
@@ -19,12 +19,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.116.0";
|
||||
version = "1.118.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
hash = "sha256-rrlg4A3coeois4kdSrSuVQ8bMOaqL2cxdJhLlozDDyg=";
|
||||
hash = "sha256-ZjJQkl9KgrCwxafHyQzX+wutl5FIdwHpKGaB5mlhdsc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
diff --git a/common/smtppass.c b/common/smtppass.c
|
||||
index d9be1ba..4a366f4 100644
|
||||
--- a/common/smtppass.c
|
||||
+++ b/common/smtppass.c
|
||||
@@ -60,15 +60,15 @@
|
||||
|
||||
#include "usuals.h"
|
||||
|
||||
-#ifdef LINUX_TRANSPARENT_PROXY
|
||||
-#include <linux/netfilter_ipv4.h>
|
||||
-#endif
|
||||
-
|
||||
#include "compat.h"
|
||||
#include "sock_any.h"
|
||||
#include "stringx.h"
|
||||
#include "sppriv.h"
|
||||
|
||||
+#ifdef LINUX_TRANSPARENT_PROXY
|
||||
+#include <linux/netfilter_ipv4.h>
|
||||
+#endif
|
||||
+
|
||||
/* -----------------------------------------------------------------------
|
||||
* STRUCTURES
|
||||
*/
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clamsmtp";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://thewalter.net/stef/software/clamsmtp/${pname}-${version}.tar.gz";
|
||||
sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5";
|
||||
};
|
||||
|
||||
patches = [ ./header-order.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "SMTP filter that allows to check for viruses using the ClamAV
|
||||
anti-virus software";
|
||||
homepage = "http://thewalter.net/stef/software/clamsmtp/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.ekleog ];
|
||||
mainProgram = "clamsmtpd";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "cloudlogoffline";
|
||||
version = "1.1.5";
|
||||
rev = self.version;
|
||||
hash = "sha256-CF56yk7hsM4M43le+CLy93oLyZ9kaqaRTFWtjJuF6Vo=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit (self) rev hash;
|
||||
owner = "myzinsky";
|
||||
repo = "cloudLogOffline";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
qt6.qmake
|
||||
qt6.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qtlocation
|
||||
qt6.qtpositioning
|
||||
qt6.qtsvg
|
||||
];
|
||||
|
||||
postPatch =
|
||||
let
|
||||
targetDir = if stdenv.hostPlatform.isDarwin then "Applications" else "bin";
|
||||
in
|
||||
''
|
||||
substituteInPlace CloudLogOffline.pro \
|
||||
--replace 'target.path = /opt/$''${TARGET}/bin' "target.path = $out/${targetDir}"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
install -d $out/share/pixmaps
|
||||
install -m644 images/logo_circle.svg $out/share/pixmaps/cloudlogoffline.svg
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# FIXME: For some reason, the Info.plist isn't copied correctly to
|
||||
# the application bundle when building normally, instead creating an
|
||||
# empty file. This doesn't happen when building in a dev shell with
|
||||
# genericBuild.
|
||||
# So, just copy the file manually.
|
||||
plistPath="$out/Applications/CloudLogOffline.app/Contents/Info.plist"
|
||||
[[ -s "$plistPath" ]] && { echo "expected Info.plist to be empty; workaround no longer needed?"; exit 1; }
|
||||
install -m644 macos/Info.plist $out/Applications/CloudLogOffline.app/Contents/Info.plist
|
||||
'';
|
||||
|
||||
desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
(makeDesktopItem {
|
||||
name = "cloudlogoffline";
|
||||
desktopName = "CloudLogOffline";
|
||||
exec = "CloudLogOffline";
|
||||
icon = "cloudlogoffline";
|
||||
comment = self.meta.description;
|
||||
genericName = "Ham radio contact logbook";
|
||||
categories = [
|
||||
"Network"
|
||||
"Utility"
|
||||
"HamRadio"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Offline frontend for Cloudlog";
|
||||
homepage = "https://github.com/myzinsky/cloudLogOffline";
|
||||
license = [ lib.licenses.lgpl3 ];
|
||||
mainProgram = "CloudLogOffline";
|
||||
maintainers = [ lib.maintainers.dblsaiko ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "container2wasm";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ktock";
|
||||
repo = "container2wasm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1m5BX8w6PVV7gsTXas+rdQirOu1RicbJDZdGj0Fh5sc=";
|
||||
hash = "sha256-detM0A8pm65VmEuEh7Xc+LcXfz4aq9p46NvJtdzfzAA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-azlZt+E8S+TjIEhwwmvRjAig4EVqbUm9tsFiIXim0Rs=";
|
||||
vendorHash = "sha256-G75YojD+GR1C++crDkWS3A4nrUI9HwZfxmKpdNZ7qYY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -21,19 +21,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "crosvm";
|
||||
version = "0-unstable-2025-05-06";
|
||||
version = "0-unstable-2025-05-16";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "55ea45ba0b2b95b49287e5498fb46b74f7a83ac6";
|
||||
hash = "sha256-i9p3UFtGSbSAlup2h/UpXBGy4huFbpeKegTMMB+I5us=";
|
||||
rev = "581ccb06d726b037fd75f64ef964b3d0eb989e33";
|
||||
hash = "sha256-U4qWUPuGuAJlTMFY3qHTrlSmNYgxzuYxCHzZZ2O48FA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-23F0WU//4xvP9xffxr+cQa0m0sSJjcWyz+usKBpDg20=";
|
||||
cargoHash = "sha256-ZagGHo1DxSR51rvt0SKO1grhvKth5CuxXiCT6rKqGGk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
+13
-13
@@ -31,13 +31,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "protobuf-net",
|
||||
"version": "3.2.46",
|
||||
"hash": "sha256-NirxAUXEIUQz0HHLS+KS4fgOZwJy1zJZYGcjPa5ujTs="
|
||||
"version": "3.2.52",
|
||||
"hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek="
|
||||
},
|
||||
{
|
||||
"pname": "protobuf-net.Core",
|
||||
"version": "3.2.46",
|
||||
"hash": "sha256-Srg7pP7rleL462idLPFUxgXBLrywWeHFyEvSV+keA4E="
|
||||
"version": "3.2.52",
|
||||
"hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ="
|
||||
},
|
||||
{
|
||||
"pname": "QRCoder",
|
||||
@@ -46,18 +46,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "SteamKit2",
|
||||
"version": "3.0.2",
|
||||
"hash": "sha256-bRiLFaq/hsr+7BKtSKoD2+pf0VCGhBYe/rO3DgqMZpo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
|
||||
"version": "3.2.0",
|
||||
"hash": "sha256-hB/36fP9kf+1mIx+hTELUMHe8ZkmSKxOK41ZzOaBa3E="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Hashing",
|
||||
"version": "9.0.1",
|
||||
"hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs="
|
||||
"version": "9.0.4",
|
||||
"hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.AccessControl",
|
||||
@@ -68,5 +63,10 @@
|
||||
"pname": "System.Security.Principal.Windows",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
|
||||
},
|
||||
{
|
||||
"pname": "ZstdSharp.Port",
|
||||
"version": "0.8.5",
|
||||
"hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "depotdownloader";
|
||||
version = "3.1.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SteamRE";
|
||||
repo = "DepotDownloader";
|
||||
rev = "DepotDownloader_${version}";
|
||||
hash = "sha256-xqy2SNyvJjisaPUyPsnXs6cVbT9SGdeVegVub+cs/LQ=";
|
||||
hash = "sha256-zduNWIQi+ItNSh9RfRfY0giIw/tMQIMRh9woUzQ5pJw=";
|
||||
};
|
||||
|
||||
projectFile = "DepotDownloader.sln";
|
||||
|
||||
@@ -12,14 +12,14 @@ let
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dooit";
|
||||
version = "3.1.0";
|
||||
version = "3.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dooit-org";
|
||||
repo = "dooit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tqSWDW3nj+nMt7t5vgSqWvtx7YA3y2GV29gI1MYFMhc=";
|
||||
hash = "sha256-2W3iO4AOuDdDKJDMMY8YKXlI+dQKRI3PQtkdi9J3wZo=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
diff -Naur source.old/src/makefile source/src/makefile
|
||||
--- source.old/src/makefile 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source/src/makefile 2021-06-07 18:58:48.851231787 -0300
|
||||
@@ -101,14 +101,14 @@
|
||||
|
||||
# need packages nodejs and libnode-dev
|
||||
js_hello_v8 : js_hello_v8.cpp
|
||||
- g++ -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8
|
||||
+ $(CXX) -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8
|
||||
|
||||
HELLOEXTRA = stringfile.o messages.o msg-strings.o startwindow.o ebrc.o format.o http.o isup.o fetchmail.o sendmail.o plugin.o buffers.o dbstubs.o html.o decorate.o html-tidy.o css.o
|
||||
js_hello_moz : js_hello_moz.o $(HELLOEXTRA) jseng-moz.o
|
||||
$(CC) js_hello_moz.o $(HELLOEXTRA) jseng-moz.o $(LDFLAGS) -lmozjs-$(SMV) -lstdc++ -o $@
|
||||
|
||||
js_hello_quick : js_hello_quick.c
|
||||
- gcc $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick -L/usr/local/lib/quickjs -lquickjs -lm -ldl -lpthread -latomic
|
||||
+ $(CC) $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick $(QUICKJS_LDFLAGS) -lm -lpthread
|
||||
|
||||
hello: js_hello_duk js_hello_v8 js_hello_moz js_hello_quick
|
||||
|
||||
@@ -1,102 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
curl,
|
||||
duktape,
|
||||
fetchFromGitHub,
|
||||
html-tidy,
|
||||
openssl,
|
||||
pcre,
|
||||
perl,
|
||||
pkg-config,
|
||||
quickjs,
|
||||
readline,
|
||||
stdenv,
|
||||
unixODBC,
|
||||
which,
|
||||
withODBC ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "edbrowse";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CMB";
|
||||
repo = "edbrowse";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
patches = [
|
||||
# Fixes some small annoyances on src/makefile
|
||||
./0001-small-fixes.patch
|
||||
];
|
||||
|
||||
patchFlags = [
|
||||
"-p2"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for file in $(find ./tools/ -type f ! -name '*.c'); do
|
||||
patchShebangs $file
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
curl
|
||||
duktape
|
||||
html-tidy
|
||||
openssl
|
||||
pcre
|
||||
perl
|
||||
quickjs
|
||||
readline
|
||||
]
|
||||
++ lib.optionals withODBC [
|
||||
unixODBC
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
buildFlagsArray+=(
|
||||
BUILD_EDBR_ODBC=${if withODBC then "on" else "off"}
|
||||
EBDEMIN=on
|
||||
QUICKJS_LDFLAGS="-L${quickjs}/lib/quickjs -lquickjs -ldl -latomic"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://edbrowse.org/";
|
||||
description = "Command Line Editor Browser";
|
||||
longDescription = ''
|
||||
Edbrowse is a combination editor, browser, and mail client that is 100%
|
||||
text based. The interface is similar to /bin/ed, though there are many
|
||||
more features, such as editing multiple files simultaneously, and
|
||||
rendering html. This program was originally written for blind users, but
|
||||
many sighted users have taken advantage of the unique scripting
|
||||
capabilities of this program, which can be found nowhere else. A batch
|
||||
job, or cron job, can access web pages on the internet, submit forms, and
|
||||
send email, with no human intervention whatsoever. edbrowse can also tap
|
||||
into databases through odbc. It was primarily written by Karl Dahlke.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl1Plus ];
|
||||
mainProgram = "edbrowse";
|
||||
maintainers = with lib.maintainers; [
|
||||
schmitthenner
|
||||
equirosa
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
# TODO: send the patch to upstream developers
|
||||
Generated
-7571
File diff suppressed because it is too large
Load Diff
@@ -1,28 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
let
|
||||
fetch_librusty_v8 =
|
||||
args:
|
||||
fetchurl {
|
||||
name = "librusty_v8-${args.version}";
|
||||
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
|
||||
hash = args.shas.${stdenv.hostPlatform.system};
|
||||
meta = {
|
||||
inherit (args) version;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.97.1";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-wQBEi2Vs5ruhSkq0n3z8WWjls6V3th2cm+O6s4LDB8k=";
|
||||
aarch64-linux = "sha256-U0PCUNcshm7AaBuUgwQQ1Qn9dr1iL2Okodl6BI/nZR8=";
|
||||
x86_64-darwin = "sha256-cGXOstCOdqaOpU2LcOT5A0JfnkoDvUHhOcCJ9vsS7CM=";
|
||||
aarch64-darwin = "sha256-9TmAON0KUVRQISTudyryIhf4VC/Dc4caq69iquDdrTU=";
|
||||
};
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "edge-runtime";
|
||||
version = "1.60.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w0iSKHT6aIixKh1bHg1lOQNEw/emKK7R2iLzWjb2Pnk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"deno_core-0.293.0" = "sha256-5WBORHokzWPdro9rmBijcsx/j81YFaEfMIK276bfI1o=";
|
||||
"eszip-0.72.2" = "sha256-lzJeapA5NTWBnBaQY8i82OeYN2DIukJZKoRAXFG4qVA=";
|
||||
"ort-2.0.0-rc.2" = "sha256-jOKeulnW/m+q1xf77jaNzLT+In/AFcSDDbz7xF23x5g=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
|
||||
|
||||
# The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
|
||||
# To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
|
||||
RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { };
|
||||
|
||||
# For version tag
|
||||
GIT_V_TAG = version;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/edge-runtime --help
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services";
|
||||
mainProgram = "edge-runtime";
|
||||
homepage = "https://github.com/supabase/edge-runtime";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gsl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "est-sfs";
|
||||
version = "2.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/est-usfs/${pname}-release-${version}.tar.gz";
|
||||
sha256 = "1hvamrgagz0xi89w8qafyd9mjrdpyika8zm22drddnjkp4sdj65n";
|
||||
};
|
||||
|
||||
buildInputs = [ gsl ];
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/doc/${pname}
|
||||
cp est-sfs $out/bin
|
||||
cp est-sfs-documentation.pdf $out/share/doc/${pname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceforge.net/projects/est-usfs";
|
||||
description = "Estimate the unfolded site frequency spectrum and ancestral states";
|
||||
mainProgram = "est-sfs";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.bzizou ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fcgi";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FastCGI-Archives";
|
||||
repo = "fcgi2";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-DsL44onRIUnf99Y+hTjMOaEVp6cjbdqksm4V+1od6pU=";
|
||||
hash = "sha256-rVurW9zcUT4IFVmrq/kuGuMbv6geQZC+WyAtqtN778Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -23,13 +23,13 @@ in
|
||||
flutter327.buildFlutterApplication (
|
||||
rec {
|
||||
pname = "fluffychat-${targetFlutterPlatform}";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krille-chan";
|
||||
repo = "fluffychat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yCbZCNyZqnYKep0sqkkMn8oz/4lRz7D9he/403MyK9U=";
|
||||
hash = "sha256-c7vSrJ8IYBMQ9JwyLFJGamlvKK7DVzh5y/sybDaibgI=";
|
||||
};
|
||||
|
||||
inherit pubspecLock;
|
||||
@@ -49,6 +49,7 @@ flutter327.buildFlutterApplication (
|
||||
maintainers = with maintainers; [
|
||||
mkg20001
|
||||
tebriel
|
||||
aleksana
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
|
||||
@@ -1008,11 +1008,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "go_router",
|
||||
"sha256": "f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3",
|
||||
"sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "14.8.1"
|
||||
"version": "15.1.2"
|
||||
},
|
||||
"gtk": {
|
||||
"dependency": "transitive",
|
||||
@@ -1434,11 +1434,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "matrix",
|
||||
"sha256": "829f225f74b2a8c83b6b1f960004ecf742215d9ee9d8cc9e0f1974ff8e281f0f",
|
||||
"sha256": "7d15fdbc760be7e40c58bb65e03baa8241b1e31db2bc67dab61883aabc083a85",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.39.1"
|
||||
"version": "0.40.0"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
gmp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "git-annex-utils";
|
||||
version = "0.04-3-g531bb33";
|
||||
src = fetchgit {
|
||||
url = "http://git.mysteryvortex.com/repositories/git-annex-utils.git";
|
||||
rev = "531bb33";
|
||||
sha256 = "1sv7s2ykc840cjwbfn7ayy743643x9i1lvk4cd55w9l052xvzj65";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
];
|
||||
buildInputs = [
|
||||
libtool
|
||||
gmp
|
||||
];
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
description = "gadu, a du like utility for annexed files";
|
||||
longDescription = ''
|
||||
This is a set of utilities that are handy to use with git-annex repositories.
|
||||
Currently there is only one utility gadu, a du like utility for annexed files.
|
||||
'';
|
||||
homepage = "https://git-annex.mysteryvortex.com/git-annex-utils.html";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ woffs ];
|
||||
mainProgram = "gadu";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-frog";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TenderOwl";
|
||||
repo = "Frog";
|
||||
tag = version;
|
||||
sha256 = "sha256-Zu1xUGpjqpFiPQAAgaVYtnXI4jMtyywrJqn+38K5VHo=";
|
||||
sha256 = "sha256-p1gqom9saNEIm6FXinEuIJtMGwjGfQx9uLpR2kb46Uw=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "iredis";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laixintao";
|
||||
repo = "iredis";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wfjr/FVmKgkP8FMKxw6e8U+lfZQZ2q52REC0mU8Xp7Q=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZA4q2Z3X9zhzW/TH8aRliVij8UxqDVUamhKcfVxWb/c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal Client for Redis with AutoCompletion and Syntax Highlighting";
|
||||
changelog = "https://github.com/laixintao/iredis/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/laixintao/iredis/blob/${src.tag}/CHANGELOG.md";
|
||||
homepage = "https://iredis.xbin.io/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kine";
|
||||
version = "0.13.13";
|
||||
version = "0.13.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k3s-io";
|
||||
repo = "kine";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gsi7r3l1UoGaARWtaISweISKSGx/Xir8RDLXwfyTa8Y=";
|
||||
hash = "sha256-dRyly3WkNziQf9m+IkCB4294WfGZCWBFt0auubb9vms=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rNt+3dCILTzUruMpKAnypZAPNrcylLgIw2vtlHNUv50=";
|
||||
vendorHash = "sha256-xsGX7cVfwx5+P3ArWUFnQvJAHgzgV2AwKGOHJZngN40=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
From 2c0bb6891349ed880634352e4551ed48002e53eb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
|
||||
Date: Fri, 4 Aug 2023 13:54:03 +0100
|
||||
Subject: [PATCH] fix snprintf overflow
|
||||
|
||||
fix *** buffer overflow detected ***: terminated
|
||||
|
||||
fix #367
|
||||
---
|
||||
src/oformat_parser.c | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/oformat_parser.c b/src/oformat_parser.c
|
||||
index 7bc5edcf..3775d035 100644
|
||||
--- a/src/oformat_parser.c
|
||||
+++ b/src/oformat_parser.c
|
||||
@@ -534,7 +534,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
int max_number_of_digits = splt_u_get_requested_num_of_digits(state,
|
||||
state->oformat.format[i], &requested_num_of_digits, SPLT_FALSE);
|
||||
|
||||
- snprintf(temp + offset, temp_len, "%s", format);
|
||||
+ snprintf(temp + offset, temp_len - offset, "%s", format);
|
||||
|
||||
fm_length = strlen(temp) + 1 + max_number_of_digits;
|
||||
if ((fm = malloc(fm_length * sizeof(char))) == NULL)
|
||||
@@ -564,7 +564,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
//
|
||||
if (artist_or_performer != NULL)
|
||||
{
|
||||
- snprintf(temp+2,temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2,temp_len-2, "%s", state->oformat.format[i]+2);
|
||||
|
||||
int artist_length = 0;
|
||||
artist_length = strlen(artist_or_performer);
|
||||
@@ -609,7 +609,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
//
|
||||
if (artist != NULL)
|
||||
{
|
||||
- snprintf(temp+2,temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2,temp_len-2, "%s", state->oformat.format[i]+2);
|
||||
|
||||
int artist_length = 0;
|
||||
artist_length = strlen(artist);
|
||||
@@ -655,7 +655,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
{
|
||||
int album_length = 0;
|
||||
album_length = strlen(album);
|
||||
- snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2, temp_len-2, "%s", state->oformat.format[i]+2);
|
||||
|
||||
fm_length = strlen(temp) + album_length + 1;
|
||||
}
|
||||
@@ -699,7 +699,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
{
|
||||
int genre_length = 0;
|
||||
genre_length = strlen(genre);
|
||||
- snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2, temp_len-2, "%s", state->oformat.format[i]+2);
|
||||
|
||||
fm_length = strlen(temp) + genre_length + 1;
|
||||
}
|
||||
@@ -743,7 +743,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
{
|
||||
int title_length = 0;
|
||||
title_length = strlen(title);
|
||||
- snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2, temp_len-2, "%s", state->oformat.format[i]+2);
|
||||
|
||||
fm_length = strlen(temp) + title_length + 1;
|
||||
}
|
||||
@@ -787,7 +787,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
{
|
||||
int performer_length = 0;
|
||||
performer_length = strlen(performer);
|
||||
- snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2, temp_len-2, "%s", state->oformat.format[i]+2);
|
||||
|
||||
fm_length = strlen(temp) + performer_length + 1;
|
||||
}
|
||||
@@ -862,7 +862,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
const char *format =
|
||||
splt_u_get_format_ptr(state->oformat.format[i], temp, NULL);
|
||||
|
||||
- snprintf(temp + 4, temp_len, "%s", format + 2);
|
||||
+ snprintf(temp + 4, temp_len-4, "%s", format + 2);
|
||||
fm_length = strlen(temp) + 1 + max_num_of_digits;
|
||||
}
|
||||
else
|
||||
@@ -903,7 +903,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
original_filename = strdup(splt_su_get_fname_without_path(splt_t_get_filename_to_split(state)));
|
||||
if (original_filename)
|
||||
{
|
||||
- snprintf(temp+2,temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2,temp_len-2 , "%s", state->oformat.format[i]+2);
|
||||
|
||||
splt_su_cut_extension(original_filename);
|
||||
|
||||
@@ -934,7 +934,7 @@ int splt_of_put_output_format_filename(splt_state *state, int current_split)
|
||||
|
||||
if (last_dir)
|
||||
{
|
||||
- snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
|
||||
+ snprintf(temp+2, temp_len-2, "%s", state->oformat.format[i]+2);
|
||||
|
||||
int last_dir_length = strlen(last_dir);
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libtool,
|
||||
libmad,
|
||||
libid3tag,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmp3splt";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mp3splt/${pname}-${version}.tar.gz";
|
||||
sha256 = "1p1mn2hsmj5cp40fnc8g1yfvk72p8pjxi866gjdkgjsqrr7xdvih";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix buffer overflow in string formatting: https://github.com/mp3splt/mp3splt/pull/368
|
||||
./fix-buffer-overflow.patch
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
nativeBuildInputs = [ libtool ];
|
||||
buildInputs = [
|
||||
libmad
|
||||
libid3tag
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-pcre" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceforge.net/projects/mp3splt/";
|
||||
description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
|
||||
maintainers = with maintainers; [ bosu ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmysqlconnectorcpp";
|
||||
version = "9.2.0";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mysql/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
|
||||
hash = "sha256-JJ6sLHfy5HgODWGxw/ZxrJPMbjfu58nLgWVZMOOjhDU=";
|
||||
hash = "sha256-Jopvf0pstZ9T3eWWI74VWfkTop7B3oG/D/zL94DRtBY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsigsegv";
|
||||
version = "2.14";
|
||||
version = "2.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libsigsegv/libsigsegv-${version}.tar.gz";
|
||||
sha256 = "sha256-zaw5QYAzZM+BqQhJm+t5wgDq1gtrW0DK0ST9HgbKopU=";
|
||||
sha256 = "sha256-A2hVZgIlyzgXoZD8AOZ2TOeDYFG6y0jTXiZES4wXKdk=";
|
||||
};
|
||||
|
||||
patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null;
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.09";
|
||||
version = "4.10";
|
||||
pname = "quota";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
|
||||
sha256 = "sha256-nNrKFUvJKvwxF/Dl9bMgjdX4RYOvHPBhw5uqCiuxQvk=";
|
||||
sha256 = "sha256-oEoMr8opwVvotqxmDgYYi8y4AsGe/i58Ge1/PWZ+z14=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -6,15 +6,17 @@
|
||||
|
||||
haskellPackages.mkDerivation {
|
||||
pname = "lngen";
|
||||
version = "unstable-2024-10-22";
|
||||
version = "0-unstable-2024-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "plclub";
|
||||
repo = "lngen";
|
||||
rev = "c034c8d95264e6a5d490bc4096534ccd54f0d393";
|
||||
hash = "sha256-XzcB/mNXure6aZRmwgUWGHSEaknrbP8Onk2CisVuhiw=";
|
||||
};
|
||||
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
||||
libraryHaskellDepends = with haskellPackages; [
|
||||
base
|
||||
syb
|
||||
@@ -23,6 +25,12 @@ haskellPackages.mkDerivation {
|
||||
mtl
|
||||
];
|
||||
executableHaskellDepends = with haskellPackages; [ base ];
|
||||
|
||||
# Fix build on GHC >=9.8.1, where using partial functions was made an error with `-Werror`
|
||||
preBuild = ''
|
||||
substituteInPlace lngen.cabal --replace-fail "-Werror" "-Werror -Wwarn=x-partial"
|
||||
'';
|
||||
|
||||
homepage = "https://github.com/plclub/lngen";
|
||||
description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott";
|
||||
maintainers = with lib.maintainers; [ chen ];
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meme-suite";
|
||||
version = "5.5.4";
|
||||
version = "5.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://meme-suite.org/meme-software/${version}/meme-${version}.tar.gz";
|
||||
sha256 = "sha256-zaYBHCuFW/JWPE56LCVeEembW25ec3Nv8AiUJQdYAVM=";
|
||||
sha256 = "sha256-HcqNDm0dNlcMGoirjb5+Sxd3M/u+rKoujEZ0/r9XqvQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
libmp3splt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mp3splt";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--enable-oggsplt-symlink"
|
||||
"--enable-flacsplt-symlink"
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libmp3splt ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
|
||||
homepage = "https://sourceforge.net/projects/mp3splt/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.bosu ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nexttrace";
|
||||
version = "1.3.7";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxtrace";
|
||||
repo = "NTrace-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UmViXxyOvzs2ifG7y+OA+/BjzbF6YIc6sjDUN+ttS8w=";
|
||||
sha256 = "sha256-S3rxA5V3x4xdfUiq+XnP2ObE2gQ/3IcooIx6ShNkLrc=";
|
||||
};
|
||||
vendorHash = "sha256-rSCg6TeCVdYldghmFCXtv2R9mQ97b3DogZhFcSTzt4o=";
|
||||
vendorHash = "sha256-9CNreBLmx1t95M8BijfytDxDrr/GL1GPI/ed9SdYae4=";
|
||||
|
||||
doCheck = false; # Tests require a network connection.
|
||||
|
||||
|
||||
@@ -1,95 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
boost,
|
||||
howard-hinnant-date,
|
||||
|
||||
# for tests
|
||||
runCommand,
|
||||
pijul,
|
||||
nixVersions,
|
||||
nixOverride ? null,
|
||||
nix-plugin-pijul,
|
||||
}:
|
||||
let
|
||||
nix = if nixOverride != null then nixOverride else nixVersions.nix_2_24;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nix-plugin-pijul";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-BOuBaFvejv1gffhBlAJADLtd5Df71oQbuCnniU07nF4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
howard-hinnant-date
|
||||
nix
|
||||
];
|
||||
|
||||
passthru.tests =
|
||||
let
|
||||
localRepoCheck =
|
||||
nixOverride:
|
||||
runCommand "localRepoCheck-${nixOverride.name}"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
pijul
|
||||
nix
|
||||
];
|
||||
}
|
||||
''
|
||||
export HOME=$(mktemp -d)
|
||||
export EDITOR=true
|
||||
pijul identity new --no-link --no-prompt --display-name 'Test User' --email 'test@example.com'
|
||||
|
||||
pijul init repo
|
||||
cd repo
|
||||
|
||||
echo "it works" > foo
|
||||
pijul add foo
|
||||
pijul record --message 'Add foo'
|
||||
|
||||
output=$(
|
||||
nix \
|
||||
--option plugin-files ${
|
||||
nix-plugin-pijul.override { inherit nixOverride; }
|
||||
}/lib/nix/plugins/pijul.so \
|
||||
--extra-experimental-features 'nix-command flakes' \
|
||||
eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")"
|
||||
)
|
||||
|
||||
echo $output
|
||||
|
||||
[[ "$output" = "it works" ]]
|
||||
|
||||
mkdir $out
|
||||
'';
|
||||
in
|
||||
{
|
||||
stable = localRepoCheck nixVersions.stable;
|
||||
latest = localRepoCheck nixVersions.latest;
|
||||
git = localRepoCheck nixVersions.git;
|
||||
nix_2_24 = localRepoCheck nixVersions.nix_2_24;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Plugin to add Pijul support to the Nix package manager";
|
||||
homepage = "https://nest.pijul.com/dblsaiko/nix-plugin-pijul";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ lib.maintainers.dblsaiko ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -27,7 +27,10 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = lib.optionals mbedtlsSupport [ mbedtls ];
|
||||
|
||||
cmakeFlags =
|
||||
[ "-G Ninja" ]
|
||||
[
|
||||
"-G Ninja"
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
]
|
||||
++ lib.optionals mbedtlsSupport [
|
||||
"-DMBEDTLS_ROOT_DIR=${mbedtls}"
|
||||
"-DNNG_ENABLE_TLS=ON"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "nodemon";
|
||||
version = "3.1.9";
|
||||
version = "3.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remy";
|
||||
repo = "nodemon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D0trs/Il7ekXXuLIsp8b9VPxQW1qqTc7DduGymv6jyU=";
|
||||
hash = "sha256-wr/HNa+iqHhlE/Qp62d1EgcwA6hsv8CsJg9NLgEa15g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-cZHfaUWhKZYKRe4Foc2UymZ8hTPrGLzlcXe1gMsW1pU=";
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notcurses";
|
||||
version = "3.0.13";
|
||||
version = "3.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dankamongmen";
|
||||
repo = "notcurses";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i3UNd1y88aOGBp2r9itBFd9w+UJQhleJQHZOiK0d26w=";
|
||||
sha256 = "sha256-qAc9jKFpYgI0SdzKHhzmrPkWg4uSXDetD/oNEmHob2o=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "npm-check-updates";
|
||||
version = "17.1.18";
|
||||
version = "18.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raineorshine";
|
||||
repo = "npm-check-updates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0aSVYWksOpUL2i0T5Y0CeLU0Nv4tH+0nGSY57LZRNkg=";
|
||||
hash = "sha256-JVwjjGs1BCQnL9q4zwnQ56JRWL5CZ9cf4FyK2jpfKKE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/kDeGiUb/zQ7LQU6Lg0YhvdFRccbezJmsEx+A5WEw8w=";
|
||||
npmDepsHash = "sha256-75YPV96eKIhNVIT10ZYTJOVzJEFk98a2e4XUIoiYRd4=";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/"prepare"/d' package.json
|
||||
|
||||
@@ -73,13 +73,13 @@ let
|
||||
(self: super: {
|
||||
octoprint = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
hash = "sha256-Zc9t2mZQVvwJsyd0VaS8tMdGm9Ix3/QNl5ogeOTohVU=";
|
||||
hash = "sha256-eH5AWeER2spiWgtRM5zMp40OakpM5TMXO07WjdY7gNU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ols";
|
||||
version = "0-unstable-2025-04-05";
|
||||
version = "0-unstable-2025-05-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielGavin";
|
||||
repo = "ols";
|
||||
rev = "011b0bdec303783b6ce2a197957effef480ca50d";
|
||||
hash = "sha256-uyAxeUI0tKeAauSpOhuPMaqav5ksaawayiFWidInFUI=";
|
||||
rev = "89f83305019a70d714af015aec734700dfee967c";
|
||||
hash = "sha256-z+0+eEc+DOmHRv4jt3kOq4WvvJ4o+h9j/JDYgmxNCms=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,45 +5,20 @@
|
||||
fetchPypi,
|
||||
oncall,
|
||||
nixosTests,
|
||||
|
||||
# Override Python packages using
|
||||
# self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }
|
||||
# Applied after defaultOverrides
|
||||
packageOverrides ? self: super: { },
|
||||
fetchpatch,
|
||||
}:
|
||||
let
|
||||
defaultOverrides = [
|
||||
# Override the version of some packages pinned in Oncall's setup.py
|
||||
(self: super: {
|
||||
# Support for Falcon 4.X missing
|
||||
# https://github.com/linkedin/oncall/issues/430
|
||||
falcon = super.falcon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.1.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "falconry";
|
||||
repo = "falcon";
|
||||
tag = version;
|
||||
hash = "sha256-7719gOM8WQVjODwOSo7HpH3HMFFeCGQQYBKktBAevig=";
|
||||
};
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oncall";
|
||||
version = "2.1.7";
|
||||
# Using newer revision for Falcon 4 patch to work
|
||||
version = "0-unstable-2025-04-15";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linkedin";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oqzU4UTpmAcZhqRilquxWQVyHv8bqq0AGraiSqwauiI=";
|
||||
#tag = "v${version}";
|
||||
rev = "030f5d0286b253e4300d36de1954c7b2a7490a76";
|
||||
hash = "sha256-Lox9aqYKsl/vg6mNwr0MoLmJQkC+kEf7AqvCCKhgo94=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -55,9 +30,17 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
# Log Python errors to uwsgi
|
||||
./verbose_logging.patch
|
||||
|
||||
# Add support for Falcon 4
|
||||
# https://github.com/linkedin/oncall/pull/433
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linkedin/oncall/commit/4ccf2239fb8c8aeda376f57735461174f48614f2.patch";
|
||||
hash = "sha256-XT7Z6NUg2zxoRtgxaM0ZbBhXtO9xvhKv30Jo1ZaEGMU=";
|
||||
name = "falcon_4_support.patch";
|
||||
})
|
||||
];
|
||||
|
||||
dependencies = with python.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
beaker
|
||||
falcon
|
||||
falcon-cors
|
||||
@@ -80,7 +63,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
cp -r configs db "$out/share/"
|
||||
'';
|
||||
|
||||
checkInputs = with python.pkgs; [
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
];
|
||||
@@ -113,14 +96,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
tests = {
|
||||
inherit (nixosTests) oncall;
|
||||
};
|
||||
inherit python;
|
||||
pythonPath = "${python.pkgs.makePythonPath dependencies}:${oncall}/${python.sitePackages}";
|
||||
pythonPath = "${python3.pkgs.makePythonPath dependencies}:${oncall}/${python3.sitePackages}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A calendar web-app designed for scheduling and managing on-call shifts";
|
||||
homepage = "http://oncall.tools";
|
||||
changelog = "https://github.com/linkedin/oncall/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/linkedin/oncall/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
mainProgram = "oncall";
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
let
|
||||
pname = "polypane";
|
||||
version = "23.1.1";
|
||||
version = "24.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-TG2U++/DiDQMBYGbo6KOz12iwNHjOiUUUpkaG8BpamE=";
|
||||
sha256 = "sha256-iO2589e2L1q5xEoIvSUV8QBpn/uHp/FBLMFeXDgIdVY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "quilt";
|
||||
version = "0.68";
|
||||
version = "0.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-/owJ3gPBBuhbNzfI8DreFHyVa3ntevSFocijhY2zhCY=";
|
||||
sha256 = "sha256-VV3f/eIto8htHK9anB+4oVKsK4RzBDe9OcwIhJyfSFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rancher";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XpNs5D1hO+Vp+Qjoz//U7L9tAE6AwOrh08FE2G7Byv4=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-puwbZQ6JOdRODOChb2hOqW4KPIxxubOkMILFHUP/I78=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
"-static"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-WVNdeICjhDyFzDtQjIdXnoHsiPEJp/NReCRXCuTYzcQ=";
|
||||
vendorHash = "sha256-NQ5R2rYmPc5Y6tpnWm9/QL5TNe70ZWwXF51KgShyovQ=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/rancher
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "resvg";
|
||||
version = "0.44.0";
|
||||
version = "0.45.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RazrFalcon";
|
||||
repo = "resvg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y=";
|
||||
hash = "sha256-sz1fAvg5HiBJpAgH7Vy0j5eAkvW8egcHyUXCsZzOWT8=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-NHXcBKSuyL0bIriEOr1nuTnz4vra1bIYcNOGmnN5HnQ=";
|
||||
cargoHash = "sha256-jUq1BvHgs3tEI+ye04FykdunHcMMatE3Gamr3grNWQw=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package=resvg"
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
SDL2,
|
||||
libGLU,
|
||||
luajit,
|
||||
curl,
|
||||
curlpp,
|
||||
}:
|
||||
|
||||
let
|
||||
# Newer versions of sdl-gpu don't work with Riko4 (corrupted graphics),
|
||||
# and this library does not have a proper release version, so let the
|
||||
# derivation for this stay next to the Riko4 derivation for now.
|
||||
sdl-gpu = stdenv.mkDerivation {
|
||||
pname = "sdl-gpu";
|
||||
version = "2018-11-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grimfang4";
|
||||
repo = "sdl-gpu";
|
||||
rev = "a4ff1ab02410f154b004c29ec46e07b22890fa1f";
|
||||
sha256 = "1wdwg331s7r4dhq1l8w4dvlqf4iywskpdrscgbwrz9j0c6nqqi3v";
|
||||
};
|
||||
buildInputs = [
|
||||
SDL2
|
||||
libGLU
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/grimfang4/sdl-gpu";
|
||||
description = "Library for high-performance, modern 2D graphics with SDL written in C";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ CrazedProgrammer ];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "riko4";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "incinirate";
|
||||
repo = "Riko4";
|
||||
rev = "v${version}";
|
||||
sha256 = "008i9991sn616dji96jfwq6gszrspbx4x7cynxb1cjw66phyy5zp";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
luajit
|
||||
sdl-gpu
|
||||
curl
|
||||
curlpp
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
cmakeFlags = [ "-DSDL2_gpu_INCLUDE_DIR=\"${sdl-gpu}/include\"" ];
|
||||
|
||||
# Riko4 needs the data/ and scripts/ directories to be in its PWD.
|
||||
installPhase = ''
|
||||
install -Dm0755 riko4 $out/bin/.riko4-unwrapped
|
||||
mkdir -p $out/lib/riko4
|
||||
cp -r ../data $out/lib/riko4
|
||||
cp -r ../scripts $out/lib/riko4
|
||||
cat > $out/bin/riko4 <<EOF
|
||||
#!/bin/sh
|
||||
pushd $out/lib/riko4 > /dev/null
|
||||
exec $out/bin/.riko4-unwrapped "\$@"
|
||||
popd > /dev/null
|
||||
EOF
|
||||
chmod +x $out/bin/riko4
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/incinirate/Riko4";
|
||||
description = "Fantasy console for pixel art game development";
|
||||
mainProgram = "riko4";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ CrazedProgrammer ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
cmake,
|
||||
pkg-config,
|
||||
# required dependencies
|
||||
fftwFloat,
|
||||
libpng,
|
||||
libtiff,
|
||||
jemalloc,
|
||||
volk,
|
||||
nng,
|
||||
curl,
|
||||
# Optional dependencies
|
||||
withZIQRecordingCompression ? true,
|
||||
zstd,
|
||||
withGUI ? true,
|
||||
glfw,
|
||||
zenity,
|
||||
withAudio ? true,
|
||||
portaudio,
|
||||
withOfficialProductSupport ? true,
|
||||
hdf5,
|
||||
withOpenCL ? true,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
withSourceRtlsdr ? true,
|
||||
rtl-sdr-librtlsdr,
|
||||
withSourceHackRF ? true,
|
||||
hackrf,
|
||||
withSourceAirspy ? true,
|
||||
airspy,
|
||||
withSourceAirspyHF ? true,
|
||||
airspyhf,
|
||||
withSourceAD9361 ? true,
|
||||
libad9361,
|
||||
libiio,
|
||||
withSourceBladeRF ? true,
|
||||
libbladeRF,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "satdump";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SatDump";
|
||||
repo = "SatDump";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+Sne+NMwnIAs3ff64fBHAIE4/iDExIC64sXtO0LJwI0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src-core/CMakeLists.txt \
|
||||
--replace-fail '$'{CMAKE_INSTALL_PREFIX}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
fftwFloat
|
||||
libpng
|
||||
libtiff
|
||||
jemalloc
|
||||
volk
|
||||
nng
|
||||
curl
|
||||
]
|
||||
++ lib.optionals withZIQRecordingCompression [ zstd ]
|
||||
++ lib.optionals withGUI [
|
||||
glfw
|
||||
zenity
|
||||
]
|
||||
++ lib.optionals withAudio [ portaudio ]
|
||||
++ lib.optionals withOfficialProductSupport [ hdf5 ]
|
||||
++ lib.optionals withOpenCL [
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
]
|
||||
++ lib.optionals withSourceRtlsdr [ rtl-sdr-librtlsdr ]
|
||||
++ lib.optionals withSourceHackRF [ hackrf ]
|
||||
++ lib.optionals withSourceAirspy [ airspy ]
|
||||
++ lib.optionals withSourceAirspyHF [ airspyhf ]
|
||||
++ lib.optionals withSourceAD9361 [
|
||||
libad9361
|
||||
libiio
|
||||
]
|
||||
++ lib.optionals withSourceBladeRF [ libbladeRF ];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "BUILD_GUI" withGUI) ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "A generic satellite data processing software";
|
||||
homepage = "https://www.satdump.org/";
|
||||
changelog = "https://github.com/SatDump/SatDump/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
theverygaming
|
||||
];
|
||||
mainProgram = "satdump";
|
||||
};
|
||||
})
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schismtracker";
|
||||
version = "20250313";
|
||||
version = "20250415";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schismtracker";
|
||||
repo = "schismtracker";
|
||||
tag = version;
|
||||
hash = "sha256-AiQ5+HTosVOR+Z5+uT6COMLvkGS3zvXtkCkg16MhVf4=";
|
||||
hash = "sha256-VK2XdixejaoG6P1X3XG8Ow4H6CF3sNwAveJ4cCxdLuQ=";
|
||||
};
|
||||
|
||||
# If we let it try to get the version from git, it will fail and fall back
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "SDL_image";
|
||||
version = "1.2.12-unstable-2025-02-13";
|
||||
version = "1.2.12-unstable-2025-04-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_image";
|
||||
rev = "74e8d577216e3c3a969e67b68b2e4769fcbf8fdd";
|
||||
hash = "sha256-WSNH7Pw/tL5rgPQtOjxRGp2UlYSJJmXS2YQS+fAkXSc=";
|
||||
rev = "a5eac02dacd8a8940ffccd1b8d0783c0b5f8ec7d";
|
||||
hash = "sha256-vrV12fYGSh/vtCktsUVNvcRCn5lZ2tyBYwqhLPgNdhw=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "SDL_net";
|
||||
version = "1.2.8-unstable-2024-04-23";
|
||||
version = "1.2.8-unstable-2025-04-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_net";
|
||||
rev = "0043be2e559f8d562d04bf62d6e3f4162ed8edad";
|
||||
hash = "sha256-/W1Mq6hzJNNwpcx+VUT4DRGP3bE06GGMbYDGHBc4XlQ=";
|
||||
rev = "e2e041b81747bc01b2c5fb3757a082e525e5d25b";
|
||||
hash = "sha256-Nk1OoCIrHMABHuPrJHMlLyyR73px/Xikgz40RpDfonw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -49,7 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"release-(3\\..*)"
|
||||
];
|
||||
};
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
groff,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "setserial";
|
||||
version = "2.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ groff ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
postConfigure = ''
|
||||
sed -e s@/usr/man/@/share/man/@ -i Makefile
|
||||
'';
|
||||
|
||||
preInstall = ''mkdir -p "$out/bin" "$out/share/man/man8"'';
|
||||
|
||||
meta = {
|
||||
description = "Serial port configuration utility";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Only;
|
||||
mainProgram = "setserial";
|
||||
};
|
||||
}
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
let
|
||||
pname = "simplex-chat-desktop";
|
||||
version = "6.3.3";
|
||||
version = "6.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
|
||||
hash = "sha256-qm0JPwHnfICCUN5mgSrKH8V6orJ4+p/9UmrQ/GPWIBo=";
|
||||
hash = "sha256-BE0JOcl3UbYoqzihgoqfcM1yxvxodSGdm8QaBgVhHBY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sioyek";
|
||||
version = "2.0.0-unstable-2025-04-08";
|
||||
version = "2.0.0-unstable-2025-05-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = "sioyek";
|
||||
rev = "e84f4052b384c1c8d84db84d4294874e19a24f38";
|
||||
hash = "sha256-by8/LloGMi6w97nWnO8VLlJjE1ztIymP4mwvL1PWqPo=";
|
||||
rev = "eb03410682f70fa27cbe2f9ec3bf59ac086457d7";
|
||||
hash = "sha256-iLGgiHQ5MiTvKcSgT3Kqw4lCFFkuAHoZhT+mpIdlBkQ=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
diff --git a/src/dejitter.c b/src/dejitter.c
|
||||
index 1904ab3..cb3624d 100644
|
||||
--- a/src/dejitter.c
|
||||
+++ b/src/dejitter.c
|
||||
@@ -22,6 +22,8 @@
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
+#include <string.h>
|
||||
+#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
@@ -1,33 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libosip,
|
||||
sqlite,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "siproxd";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz";
|
||||
sha256 = "0dkpl3myxz3gvj2n2qpqrd19dip9il0vf7qybdvn5wgznrmplvcs";
|
||||
};
|
||||
|
||||
patches = [ ./cheaders.patch ];
|
||||
|
||||
buildInputs = [
|
||||
libosip
|
||||
sqlite
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://siproxd.sourceforge.net/";
|
||||
description = "Masquerading SIP Proxy Server";
|
||||
mainProgram = "siproxd";
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spice-protocol";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-BP+6YQ2f1EHPxH36oTXXAJbmCxBG0hGdjbL46g0X2RI=";
|
||||
sha256 = "sha256-uvWESfbonRn0dYma1fuRlv3EbAPMUyM/TjnPKXj5z/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlcl";
|
||||
version = "25.1.0.101.2353";
|
||||
version = "25.1.1.113.2054";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
|
||||
hash = "sha256-gSjKgJL7DfEj9jbrqZIA/dZ5w1bdDs3BYVAWiCwoJ3U=";
|
||||
hash = "sha256-/5hu/GeU1Ly+pR8y2dfNuDkM5kzKU0sTIu11wuVvzEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.127.1";
|
||||
version = "1.128.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Eu96Qw1ENxZ0EhZuAqicmDFvzvMD1DHvNs0s1dgUZ7U=";
|
||||
hash = "sha256-7CH//aZ7DOXIP6A1gAZpiFO55LrLtBhvtZl/tVhYl8g=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-kbaUWzHDHiCVQWxIyaSfPY818NAJR2PhbB/552NkbdM=";
|
||||
vendorHash = "sha256-CTcFTEKj5s43OlrIC7lOh3Lh/6k8/Igckv0zwrdGKbE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.18.12";
|
||||
version = "0.19.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = "stress-ng";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-utMX7bKtE2zdbOjzkwF+0Ry8Og4nSc7s4WIPYfUmQ/I=";
|
||||
hash = "sha256-CbGbGGWZDil7l04KNuizlAu9IACdtbHR5rrn39AAhio=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "subnetcalc";
|
||||
version = "2.6.2";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dreibh";
|
||||
repo = "subnetcalc";
|
||||
tag = "subnetcalc-${finalAttrs.version}";
|
||||
hash = "sha256-TiPnNfETb69snl/8LXaIfjAq92meahvfIWSJLSrlxcc=";
|
||||
hash = "sha256-FpDbU9kqen+NsJd8bSMUkTeq441+BXTKx/xKwcEBk10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.85.2";
|
||||
version = "1.85.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dUOQKKtUaWIMgm2IA2qj67AuyAvL5ifXnGq6kBuj+zw=";
|
||||
hash = "sha256-07Xx/BoBXCQuZHveH00Wn65POnTpfDx8rfIcbqSoQLg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XIMC2976vLbvl6O2Xq9VhOLFRb/3IUgspqsrVNLofHg=";
|
||||
vendorHash = "sha256-Sqr5UiT4NNiFKNEqZRDbS92AYa9SKWqYTYl4Ljx/raY=";
|
||||
|
||||
excludedPackages = [ "scripts/jsonschema" ];
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "textcompare";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josephmawa";
|
||||
repo = "TextCompare";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-npF2kCYeW/RGaS7x2FrHEX3BdmO8CXj47biOw9IZ4nk=";
|
||||
hash = "sha256-RYuWgziur4ADu99SCLh8kvzGLUzX7xqL0+Us4AsfY2g=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -55,6 +55,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace restranslator.pas --replace /usr/ $out/
|
||||
|
||||
# Fix build with lazarus 4.0, https://github.com/transmission-remote-gui/transgui/issues/1486
|
||||
substituteInPlace main.pas --replace-warn "h <> INVALID_HANDLE_VALUE" "h >= 0"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "0-unstable-2025-04-14";
|
||||
version = "0-unstable-2025-05-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "ac972674917e0241c0b2cf48a2616cce510d5437";
|
||||
hash = "sha256-QAdDfx/+8ZsDkKXeJjYTUIfKvYaF1Wl/t8jbQ1dANm4=";
|
||||
rev = "eaa194be2ab7305de4542bbaa9efb9847c111922";
|
||||
hash = "sha256-62xGpy93zGLqlwLGNGGWNSIjDzYNPVgb0Eer+e1LtxM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "upscaler";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
pyproject = false; # meson instead of pyproject
|
||||
|
||||
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "World";
|
||||
repo = "Upscaler";
|
||||
rev = version;
|
||||
hash = "sha256-yff33enYV42dRUr3zzDwUOud7mRxwFCz9BCGXpSgV9k=";
|
||||
hash = "sha256-QpKeu4k31BKcpPFLvb4iuFMdE3IwQARCDXTqWhWhBM0=";
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "1.0-unstable-2025-04-04";
|
||||
version = "1.0-unstable-2025-05-08";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "289a265c4186e84308d817f5b34086853d816fd4";
|
||||
hash = "sha256-ctjZx9IvLPEIgX9o0ZLcOW//wbGDA3YjRxg+lMdaSHs=";
|
||||
rev = "bc17707cc81a6d0ce4f9ce8d844ab4197e89f818";
|
||||
hash = "sha256-AQrfyHgsWA6SwCaSPkZI3jni+b5doS3/IormX6AFrPI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vcpkg-tool";
|
||||
version = "2025-03-13";
|
||||
version = "2025-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vcpkg-tool";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-tu6mN9y2lYsf71LUmRPMdZHE6VIWODOOQFs8+v0KIt8=";
|
||||
hash = "sha256-4XqpYEbE7TJyfdDPomcghII3iqcoX99I2GDuSHX5q2g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -137,7 +137,7 @@ buildGoModule (finalAttrs: {
|
||||
winetricks
|
||||
]
|
||||
} \
|
||||
--prefix PUREGOTK_LIB_FOLDER : ${finalAttrs.passthru.libraryPath}/lib
|
||||
--set-default PUREGOTK_LIB_FOLDER ${finalAttrs.passthru.libraryPath}/lib
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.1.10";
|
||||
version = "2.2";
|
||||
pname = "visualvm";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${
|
||||
builtins.replaceStrings [ "." ] [ "" ] version
|
||||
}.zip";
|
||||
sha256 = "sha256-CmbAYJzhzPIgUfo1M0JuwhNz6Bmymb0Fr1ERdmgQ95I=";
|
||||
sha256 = "sha256-xEqzSNM5Mkt9SQ+23Edb2NMN/o8koBjhQWTGuyZ/0m4=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@@ -2,9 +2,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
SDL2,
|
||||
callPackage,
|
||||
zlib,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -14,10 +16,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "X16Community";
|
||||
repo = "x16-emulator";
|
||||
rev = "r${finalAttrs.version}";
|
||||
tag = "r${finalAttrs.version}";
|
||||
hash = "sha256-E4TosRoORCWLotOIXROP9oqwqo1IRSa6X13GnmuxE9A=";
|
||||
};
|
||||
|
||||
# Fix build on GCC 14
|
||||
# TODO: Remove for next release as it should already be included in upstream
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/X16Community/x16-emulator/commit/3da83c93d46a99635cf73a6f9fdcf1bd4a4ae04f.patch";
|
||||
hash = "sha256-DZItqq7B1lXZ6VFsQUdQKn0wt1HaX4ymq2pI2DamY3w=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail '/bin/echo' 'echo'
|
||||
@@ -48,14 +59,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
run = (callPackage ./run.nix { }) {
|
||||
inherit (finalAttrs.finalPackage) emulator rom;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://cx16forum.com/";
|
||||
description = "Official emulator of CommanderX16 8-bit computer";
|
||||
changelog = "https://github.com/X16Community/x16-emulator/blob/r${finalAttrs.version}/RELEASES.md";
|
||||
changelog = "https://github.com/X16Community/x16-emulator/blob/${finalAttrs.src.rev}/RELEASES.md";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ pluiedev ];
|
||||
mainProgram = "x16emu";
|
||||
inherit (SDL2.meta) platforms;
|
||||
broken = stdenv.hostPlatform.isAarch64; # ofborg fails to compile it
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
cc65,
|
||||
lzsa,
|
||||
python3,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
patchShebangs findsymbols scripts/
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail '/bin/echo' 'echo'
|
||||
--replace-fail '/bin/echo' 'echo'
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -47,13 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# upstream project recommends emulator and rom to be synchronized; passing
|
||||
# through the version is useful to ensure this
|
||||
inherit (finalAttrs) version;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/X16Community/x16-rom";
|
||||
description = "ROM file for CommanderX16 8-bit computer";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ pluiedev ];
|
||||
inherit (cc65.meta) platforms;
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
runtimeShell,
|
||||
symlinkJoin,
|
||||
writeTextFile,
|
||||
writeShellScriptBin,
|
||||
}:
|
||||
|
||||
{ emulator, rom }:
|
||||
@@ -9,18 +9,10 @@
|
||||
assert emulator.version == rom.version;
|
||||
|
||||
let
|
||||
runScript = writeTextFile {
|
||||
name = "run-x16";
|
||||
text = ''
|
||||
#!${runtimeShell}
|
||||
|
||||
defaultRom="${rom}/share/x16-rom/rom.bin"
|
||||
|
||||
exec "${emulator}/bin/x16emu" -rom $defaultRom "$@"
|
||||
'';
|
||||
executable = true;
|
||||
destination = "/bin/run-x16";
|
||||
};
|
||||
runScript = writeShellScriptBin "run-x16" ''
|
||||
defaultRom="${rom}/share/x16-rom/rom.bin"
|
||||
exec "${emulator}/bin/x16emu" -rom $defaultRom "$@"
|
||||
'';
|
||||
in
|
||||
symlinkJoin {
|
||||
pname = "run-x16";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xeus";
|
||||
version = "5.2.0";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-xeus";
|
||||
repo = finalAttrs.pname;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/4SVrfPU5pkO3PNrhgdCcNUts++Or7AeMqO/PorsBdw=";
|
||||
hash = "sha256-nR247SGnc3TSj6PCrJmY6ccACvYKeSYFMgoawyYLBNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gtk2,
|
||||
libxml2,
|
||||
libxslt,
|
||||
pango,
|
||||
perl,
|
||||
pkg-config,
|
||||
popt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlroff";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmlroff";
|
||||
repo = "xmlroff";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libxml2
|
||||
libxslt
|
||||
pango
|
||||
gtk2
|
||||
popt
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/xmlroff";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureScript = "./autogen.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--disable-gp"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
|
||||
substituteInPlace Makefile --replace "docs" "" # docs target wants to download from network
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "XSL Formatter";
|
||||
homepage = "http://xmlroff.org/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
mainProgram = "xmlroff";
|
||||
};
|
||||
}
|
||||
@@ -12,19 +12,25 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "xpwn";
|
||||
version = "0.5.8git";
|
||||
version = "0.5.8-unstable-2024-04-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetbeing";
|
||||
repo = "xpwn";
|
||||
rev = "ac362d4ffe4d0489a26144a1483ebf3b431da899";
|
||||
sha256 = "1qw9vbk463fpnvvvfgzxmn9add2p30k832s09mlycr7z1hrh3wyf";
|
||||
rev = "20c32e5c12d1b22a9d55a59a0ff6267f539b77f4";
|
||||
hash = "sha256-wOSIaeNjZOKoeL4padP6UWY1O75qqHuFuSMrdCOLI2s=";
|
||||
};
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of
|
||||
# `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of
|
||||
# `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here
|
||||
"-fcommon"
|
||||
|
||||
# Fix build on GCC 14
|
||||
"-Wno-implicit-int"
|
||||
"-Wno-incompatible-pointer-types"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
rm BUILD # otherwise `mkdir build` fails on case insensitive file systems
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
# 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that
|
||||
|
||||
let
|
||||
version = "3.6-0";
|
||||
version = "4.0-0";
|
||||
|
||||
# as of 2.0.10 a suffix is being added. That may or may not disappear and then
|
||||
# come back, so just leave this here.
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz";
|
||||
hash = "sha256-5luQNn9jvxfLe/NfW+acnvcEyklOkdjGfQcuM3P6sIU=";
|
||||
hash = "sha256-vIM7RxzXqCYSiavND1OhFjuMcG5FmD+zq6kmEiM5z8s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user