Merge ce48a09129 into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2025-02-21 00:18:14 +00:00
committed by GitHub
210 changed files with 7340 additions and 9124 deletions

View File

@@ -20010,6 +20010,12 @@
githubId = 13752145;
name = "Richard Lupton";
};
rlwrnc = {
email = "raymond.lawrence@tutanota.com";
github = "rlwrnc";
githubId = 95446597;
name = "Raymond Lawrence";
};
rmcgibbo = {
email = "rmcgibbo@gmail.com";
matrix = "@rmcgibbo:matrix.org";

View File

@@ -114,6 +114,8 @@
- [autobrr](https://autobrr.com), a modern download automation tool for torrents and usenets. Available as [services.autobrr](#opt-services.autobrr.enable).
- [cross-seed](https://www.cross-seed.org), a tool to set-up fully automatic cross-seeding of torrents. Available as [services.cross-seed](#opt-services.cross-seed.enable).
- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).
- [vivid](https://github.com/sharkdp/vivid), a generator for LS_COLOR. Available as [programs.vivid](#opt-programs.vivid.enable).
@@ -124,6 +126,8 @@
- [duckdns](https://www.duckdns.org), free dynamic DNS. Available with [services.duckdns](options.html#opt-services.duckdns.enable)
- [victorialogs][https://docs.victoriametrics.com/victorialogs/], log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable)
- [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](options.html#opt-services.nostr-rs-relay.enable).
- [Prometheus Node Cert Exporter](https://github.com/amimof/node-cert-exporter), a prometheus exporter to check for SSL cert expiry. Available under [services.prometheus.exporters.node-cert](#opt-services.prometheus.exporters.node-cert.enable).

View File

@@ -512,6 +512,7 @@
./services/databases/redis.nix
./services/databases/surrealdb.nix
./services/databases/tigerbeetle.nix
./services/databases/victorialogs.nix
./services/databases/victoriametrics.nix
./services/desktops/accountsservice.nix
./services/desktops/ayatana-indicators.nix
@@ -1425,6 +1426,7 @@
./services/system/userborn.nix
./services/system/zram-generator.nix
./services/torrent/bitmagnet.nix
./services/torrent/cross-seed.nix
./services/torrent/deluge.nix
./services/torrent/flexget.nix
./services/torrent/flood.nix

View File

@@ -13,6 +13,7 @@ in
{
options.programs.mosh = {
enable = lib.mkEnableOption "mosh";
package = lib.mkPackageOption pkgs "mosh" { };
openFirewall = lib.mkEnableOption "" // {
description = "Whether to automatically open the necessary ports in the firewall.";
default = true;
@@ -29,7 +30,7 @@ in
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.mosh ];
environment.systemPackages = [ cfg.package ];
networking.firewall.allowedUDPPortRanges = lib.optional cfg.openFirewall {
from = 60000;
to = 61000;

View File

@@ -54,13 +54,13 @@ in
ReadWritePaths = "";
BindPaths = [
cfg.settings.playlists-path
cfg.settings.podcast-path
];
BindReadOnlyPaths = [
# gonic can access scrobbling services
"-/etc/resolv.conf"
"-/etc/ssl/certs/ca-certificates.crt"
builtins.storeDir
cfg.settings.podcast-path
] ++ cfg.settings.music-path
++ lib.optional (cfg.settings.tls-cert != null) cfg.settings.tls-cert
++ lib.optional (cfg.settings.tls-key != null) cfg.settings.tls-key;

View File

@@ -0,0 +1,125 @@
{
config,
pkgs,
lib,
...
}:
let
inherit (lib)
escapeShellArgs
getBin
hasPrefix
literalExpression
mkBefore
mkEnableOption
mkIf
mkOption
mkPackageOption
optionalString
types
;
cfg = config.services.victorialogs;
startCLIList = [
"${cfg.package}/bin/victoria-logs"
"-storageDataPath=/var/lib/${cfg.stateDir}"
"-httpListenAddr=${cfg.listenAddress}"
] ++ cfg.extraOptions;
in
{
options.services.victorialogs = {
enable = mkEnableOption "VictoriaLogs is an open source user-friendly database for logs from VictoriaMetrics";
package = mkPackageOption pkgs "victoriametrics" { };
listenAddress = mkOption {
default = ":9428";
type = types.str;
description = ''
TCP address to listen for incoming http requests.
'';
};
stateDir = mkOption {
type = types.str;
default = "victorialogs";
description = ''
Directory below `/var/lib` to store VictoriaLogs data.
This directory will be created automatically using systemd's StateDirectory mechanism.
'';
};
extraOptions = mkOption {
type = types.listOf types.str;
default = [ ];
example = literalExpression ''
[
"-httpAuth.username=username"
"-httpAuth.password=file:///abs/path/to/file"
"-loggerLevel=WARN"
]
'';
description = ''
Extra options to pass to VictoriaLogs. See {command}`victoria-logs -help` for
possible options.
'';
};
};
config = mkIf cfg.enable {
systemd.services.victorialogs = {
description = "VictoriaLogs logs database";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
startLimitBurst = 5;
serviceConfig = {
ExecStart = escapeShellArgs startCLIList;
DynamicUser = true;
RestartSec = 1;
Restart = "on-failure";
RuntimeDirectory = "victorialogs";
RuntimeDirectoryMode = "0700";
StateDirectory = cfg.stateDir;
StateDirectoryMode = "0700";
# Hardening
DeviceAllow = [ "/dev/null rw" ];
DevicePolicy = "strict";
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "full";
RemoveIPC = true;
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
"AF_UNIX"
];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"~@privileged"
];
};
postStart =
let
bindAddr = (optionalString (hasPrefix ":" cfg.listenAddress) "127.0.0.1") + cfg.listenAddress;
in
mkBefore ''
until ${getBin pkgs.curl}/bin/curl -s -o /dev/null http://${bindAddr}/ping; do
sleep 1;
done
'';
};
};
}

View File

@@ -184,6 +184,9 @@ let
prometheus_multiproc_dir = "/run/gitlab";
RAILS_ENV = "production";
MALLOC_ARENA_MAX = "2";
# allow to use bundler version from nixpkgs
# rather than version listed in Gemfile.lock
BUNDLER_VERSION = pkgs.bundler.version;
} // cfg.extraEnv;
runtimeDeps = [ git ] ++ (with pkgs; [

View File

@@ -0,0 +1,214 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.cross-seed;
inherit (lib)
mkEnableOption
mkPackageOption
mkOption
types
;
settingsFormat = pkgs.formats.json { };
in
{
options.services.cross-seed = {
enable = mkEnableOption "cross-seed";
package = mkPackageOption pkgs "cross-seed" { };
user = mkOption {
type = types.str;
default = "cross-seed";
description = "User to run cross-seed as.";
};
group = mkOption {
type = types.str;
default = "cross-seed";
example = "torrents";
description = "Group to run cross-seed as.";
};
configDir = mkOption {
type = types.path;
default = "/var/lib/cross-seed";
description = "Cross-seed config directory";
};
settings = mkOption {
default = { };
type = types.submodule {
freeformType = settingsFormat.type;
options = {
dataDirs = mkOption {
type = types.listOf types.path;
default = [ ];
description = ''
Paths to be searched for matching data.
If you use Injection, cross-seed will use the specified linkType
to create a link to the original file in the linkDirs.
If linkType is hardlink, these must be on the same volume as the
data.
'';
};
linkDirs = mkOption {
type = types.listOf types.path;
default = [ ];
description = ''
List of directories where cross-seed will create links.
If linkType is hardlink, these must be on the same volume as the data.
'';
};
torrentDir = mkOption {
type = types.nullOr types.path;
default = null;
description = ''
Directory containing torrent files, or if you're using a torrent
client integration and injection - your torrent client's .torrent
file store/cache.
'';
};
outputDir = mkOption {
type = types.path;
default = "${cfg.configDir}/output";
defaultText = ''''${cfg.configDir}/output'';
description = "Directory where cross-seed will place torrent files it finds.";
};
port = mkOption {
type = types.port;
default = 2468;
example = 3000;
description = "Port the cross-seed daemon listens on.";
};
};
};
description = ''
Configuration options for cross-seed.
Secrets should not be set in this option, as they will be available in
the Nix store. For secrets, please use settingsFile.
For more details, see [the cross-seed documentation](https://www.cross-seed.org/docs/basics/options).
'';
};
settingsFile = lib.mkOption {
default = null;
type = types.nullOr types.path;
description = ''
Path to a JSON file containing settings that will be merged with the
settings option. This is suitable for storing secrets, as they will not
be exposed on the Nix store.
'';
};
};
config =
let
jsonSettingsFile = settingsFormat.generate "settings.json" cfg.settings;
# Since cross-seed uses a javascript config file, we can use node's
# ability to parse JSON directly to avoid having to do any conversion.
# This also means we don't need to use any external programs to merge the
# secrets.
secretSettingsSegment =
lib.optionalString (cfg.settingsFile != null) # js
''
const path = require("node:path");
const secret_settings_json = path.join(process.env.CREDENTIALS_DIRECTORY, "secretSettingsFile");
Object.assign(loaded_settings, JSON.parse(fs.readFileSync(secret_settings_json, "utf8")));
'';
javascriptConfig =
pkgs.writeText "config.js" # js
''
"use strict";
const fs = require("fs");
const settings_json = "${jsonSettingsFile}";
let loaded_settings = JSON.parse(fs.readFileSync(settings_json, "utf8"));
${secretSettingsSegment}
module.exports = loaded_settings;
'';
in
lib.mkIf (cfg.enable) {
assertions = [
{
assertion = !(cfg.settings ? apiKey);
message = ''
The API key should be set via the settingsFile option, to avoid
exposing it on the Nix store.
'';
}
];
systemd.tmpfiles.settings."10-cross-seed"."${cfg.configDir}".d = {
inherit (cfg) group user;
mode = "700";
};
systemd.services.cross-seed = {
description = "cross-seed";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
environment.CONFIG_DIR = cfg.configDir;
preStart = ''
install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' '${javascriptConfig}' '${cfg.configDir}/config.js'
'';
serviceConfig = {
ExecStart = "${lib.getExe cfg.package} daemon";
User = cfg.user;
Group = cfg.group;
# Only allow binding to the specified port.
SocketBindDeny = "any";
SocketBindAllow = cfg.settings.port;
LoadCredential = lib.mkIf (cfg.settingsFile != null) "secretSettingsFile:${cfg.settingsFile}";
StateDirectory = "cross-seed";
ReadWritePaths = [ cfg.settings.outputDir ];
ReadOnlyPaths = lib.optional (cfg.settings.torrentDir != null) cfg.settings.torrentDir;
};
unitConfig = {
# Unfortunately, we can not protect these if we are to hardlink between them, as they need to be on the same volume for hardlinks to work.
RequiresMountsFor = lib.flatten [
cfg.settings.dataDirs
cfg.settings.linkDirs
cfg.settings.outputDir
];
};
};
# It's useful to have the package in the path, to be able to e.g. get the API key.
environment.systemPackages = [ cfg.package ];
users.users = lib.mkIf (cfg.user == "cross-seed") {
cross-seed = {
group = cfg.group;
description = "cross-seed user";
isSystemUser = true;
home = cfg.configDir;
};
};
users.groups = lib.mkIf (cfg.group == "cross-seed") {
cross-seed = { };
};
};
}

View File

@@ -253,6 +253,7 @@ in {
curl-impersonate = handleTest ./curl-impersonate.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
cross-seed = runTest ./cross-seed.nix;
cyrus-imap = runTest ./cyrus-imap.nix;
darling = handleTest ./darling.nix {};
darling-dmg = runTest ./darling-dmg.nix;
@@ -953,6 +954,7 @@ in {
seatd = handleTest ./seatd.nix {};
send = runTest ./send.nix;
service-runner = handleTest ./service-runner.nix {};
servo = runTest ./servo.nix;
shadps4 = runTest ./shadps4.nix;
sftpgo = runTest ./sftpgo.nix;
sfxr-qt = handleTest ./sfxr-qt.nix {};

View File

@@ -0,0 +1,43 @@
{ lib, ... }:
let
apiKey = "twentyfourcharacterskey!";
in
{
name = "cross-seed";
meta.maintainers = with lib.maintainers; [ pta2002 ];
nodes.machine =
{ pkgs, config, ... }:
let
cfg = config.services.cross-seed;
in
{
systemd.tmpfiles.settings."0-cross-seed-test"."${cfg.settings.torrentDir}".d = {
inherit (cfg) user group;
mode = "700";
};
services.cross-seed = {
enable = true;
settings = {
outputDir = "/var/lib/cross-seed/output";
torrentDir = "/var/lib/torrents";
torznab = [ ];
useClientTorrents = false;
};
# # We create this secret in the Nix store (making it readable by everyone).
# # DO NOT DO THIS OUTSIDE OF TESTS!!
settingsFile = (pkgs.formats.json { }).generate "secrets.json" {
inherit apiKey;
};
};
};
testScript = # python
''
start_all()
machine.wait_for_unit("cross-seed.service")
machine.wait_for_open_port(2468)
machine.succeed("curl --fail -XPOST http://localhost:2468/api/search?apiKey=${apiKey}")
'';
}

28
nixos/tests/servo.nix Normal file
View File

@@ -0,0 +1,28 @@
{
lib,
pkgs,
...
}:
{
name = "servo";
meta.maintainers = with lib.maintainers; [ hexa ];
nodes.machine = {
imports = [ ./common/x11.nix ];
environment.systemPackages = with pkgs; [ servo ];
};
enableOCR = true;
testScript = ''
machine.wait_for_x()
with subtest("Wait until Servo has finished loading the Valgrind docs page"):
machine.execute("xterm -e 'servo file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");
machine.wait_for_window("Valgrind")
machine.wait_for_text("Quick Start Guide")
'';
}

View File

@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.93";
version = "1.94";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
hash = "sha256-B91kLShg3nvOyOlBkLSpTydhUs5yHa+C/OWe8N+MB9c=";
hash = "sha256-WRHZVn83s4mGoyhd9wvP2hp2DDufXk5mrXrPuN6cdf0=";
};
nativeBuildInputs = [ cmake ];

View File

@@ -9,16 +9,16 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2024.2.2.13"; # "Android Studio Ladybug Feature Drop | 2024.2.2"
sha256Hash = "sha256-t/4e1KeVm9rKeo/VdGHbv5ogXrI8whjtgo7YjouZjLU=";
version = "2024.2.2.14"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Patch 1"
sha256Hash = "sha256-c9t8GQw2azYIf4vyiKSolnbGTUeq25rYxSgBDei7I0Q=";
};
betaVersion = {
version = "2024.3.1.10"; # "Android Studio Meerkat | 2024.3.1 Beta 1"
sha256Hash = "sha256-UxxofUCJGhQTLMwHGaSdNDqWnjkpRVwm2oqLLp3jR8E=";
version = "2024.3.1.11"; # "Android Studio Meerkat | 2024.3.1 RC 1"
sha256Hash = "sha256-6nViPI61A9XJbKxsrbLrn2tiPKaqi6Mw9RIi49Sl+7M=";
};
latestVersion = {
version = "2024.3.2.2"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 2"
sha256Hash = "sha256-P0yBlqcuTSmJ4gmSvSCW31ARqDBC3NC8PozQHIXPS8Y=";
version = "2024.3.2.5"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 5"
sha256Hash = "sha256-5HHUDZHIJkzx7iu89Ds/pjnsB2CBqz7VSUgb9VuqtKo=";
};
in {
# Attributes are named by their corresponding release channels

View File

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "debugpy";
publisher = "ms-python";
version = "2024.6.0";
hash = "sha256-VlPe65ViBur5P6L7iRKdGnmbNlSCwYrdZAezStx8Bz8=";
version = "2025.0.1";
hash = "sha256-IPjQY8G1JvpcjZWRsk1+Z8yIZ1UG0jIxmNsNXcHr+bs=";
};
meta = {

View File

@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fceumm";
version = "0-unstable-2024-11-23";
version = "0-unstable-2025-02-12";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-fceumm";
rev = "449db5de6b56e9d44fc685e1b38399f0b233bd28";
hash = "sha256-yD75ohq7dJwXt6t3RLMwTtmdLGLS3/eb98uBlnazWDk=";
rev = "26f92531a95a9a74f45a8bf13fc9f3f48cde2976";
hash = "sha256-XtSuZEfu03dFMQUX4VvpeFLzoWG3TeIBQG4cQkap+t8=";
};
meta = {

View File

@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "gambatte";
version = "0-unstable-2025-01-24";
version = "0-unstable-2025-02-14";
src = fetchFromGitHub {
owner = "libretro";
repo = "gambatte-libretro";
rev = "cd1e180b1edf6e6853cf4d501adac0538076de34";
hash = "sha256-NwxditChigU8dUhmv6pnoreG1kp7cZlLBTAexNqbiAo=";
rev = "659f38b8e01211da4383e40dfcd102c846a19dc5";
hash = "sha256-EKtXKYTYW4c0CngKrZ2QgUkObUynChZAo8cOcLVHdWE=";
};
meta = {

View File

@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "parallel-n64";
version = "0-unstable-2024-10-21";
version = "0-unstable-2025-02-06";
src = fetchFromGitHub {
owner = "libretro";
repo = "parallel-n64";
rev = "e372c5e327dcd649e9d840ffc3d88480b6866eda";
hash = "sha256-q4octB5XDdl4PtLYVZfBgydVBNaOwzu9dPBY+Y68lVo=";
rev = "a1e6d69f819cd25a30c701d244315f648818a163";
hash = "sha256-cg7FmjNqhCE4UeQzvWvgnJ2ChbOJT8iPh3Ed65Hq2iY=";
};
extraBuildInputs = [

View File

@@ -425,6 +425,7 @@ buildStdenv.mkDerivation {
"--disable-updater"
"--enable-application=${application}"
"--enable-default-toolkit=${toolkit}"
"--with-app-name=${binaryName}"
"--with-distribution-id=org.nixos"
"--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib"
"--with-wasi-sysroot=${wasiSysRoot}"

View File

@@ -9,6 +9,7 @@
buildMozillaMach rec {
pname = "firefox-beta";
binaryName = pname;
version = "135.0b9";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
@@ -27,7 +28,7 @@ buildMozillaMach rec {
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
mainProgram = "firefox";
mainProgram = binaryName;
};
tests = {
inherit (nixosTests) firefox-beta;

View File

@@ -9,6 +9,7 @@
buildMozillaMach rec {
pname = "firefox-devedition";
binaryName = pname;
version = "135.0b9";
applicationName = "Mozilla Firefox Developer Edition";
requireSigning = false;
@@ -29,7 +30,7 @@ buildMozillaMach rec {
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
mainProgram = "firefox";
mainProgram = binaryName;
};
tests = {
inherit (nixosTests) firefox-devedition;

View File

@@ -28,7 +28,6 @@
};
extraConfigureFlags = [
"--with-app-name=${pname}"
"--with-app-basename=${applicationName}"
"--with-unsigned-addon-scopes=app,system"
"--enable-proxy-bypass-protection"

View File

@@ -9,7 +9,6 @@ rec {
extraPatches = [ "${source}/patches/pref-pane/pref-pane-small.patch" ];
extraConfigureFlags = [
"--with-app-name=librewolf"
"--with-unsigned-addon-scopes=app,system"
];

View File

@@ -642,11 +642,11 @@
"vendorHash": null
},
"ibm": {
"hash": "sha256-Wq8YYVDp+hUa3iZGK2umW89v5itwK1Ig1aHIb4ojXis=",
"hash": "sha256-dmHsNNA4gKOiNLmhJ74ryNfgh2kl3zVRMVLg4UUQCPo=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.75.1",
"rev": "v1.75.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-k1EQbBnpdkC7FdvyRTM8AAhUIAk3hY4CBD9wOVQnMIs="
},

View File

@@ -1,18 +1,36 @@
{ stdenv, lib, buildFHSEnv, writeScript, makeDesktopItem }:
{
stdenv,
lib,
buildFHSEnv,
writeScript,
makeDesktopItem,
}:
let platforms = [ "i686-linux" "x86_64-linux" ]; in
let
platforms = [
"i686-linux"
"x86_64-linux"
];
in
assert lib.elem stdenv.hostPlatform.system platforms;
# Dropbox client to bootstrap installation.
# The client is self-updating, so the actual version may be newer.
let
version = "206.3.6386";
version =
{
x86_64-linux = "217.4.4417";
i686-linux = "206.3.6386";
}
.${stdenv.hostPlatform.system};
arch = {
x86_64-linux = "x86_64";
i686-linux = "x86";
}.${stdenv.hostPlatform.system};
arch =
{
x86_64-linux = "x86_64";
i686-linux = "x86";
}
.${stdenv.hostPlatform.system};
installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
@@ -22,7 +40,10 @@ let
comment = "Sync your files across computers and to the web";
desktopName = "Dropbox";
genericName = "File Synchronizer";
categories = [ "Network" "FileTransfer" ];
categories = [
"Network"
"FileTransfer"
];
startupNotify = false;
icon = "dropbox";
};
@@ -42,12 +63,41 @@ buildFHSEnv {
# Dropbox's internal limit-to-one-instance check also relies on the PID.
unsharePid = false;
targetPkgs = pkgs: with pkgs; with xorg; [
libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXmu
libXxf86vm libGL libxcb xkeyboardconfig
curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
procps zlib libgbm libxshmfence libpthreadstubs libappindicator
];
targetPkgs =
pkgs:
with pkgs;
with xorg;
[
libICE
libSM
libX11
libXcomposite
libXdamage
libXext
libXfixes
libXrender
libXmu
libXxf86vm
libGL
libxcb
xkeyboardconfig
curl
dbus
firefox-bin
fontconfig
freetype
gcc
glib
gnutar
libxml2
libxslt
procps
zlib
libgbm
libxshmfence
libpthreadstubs
libappindicator
];
extraInstallCommands = ''
mkdir -p "$out/share/applications"
@@ -85,12 +135,15 @@ buildFHSEnv {
exec "$HOME/.dropbox-dist/dropboxd" "$@"
'';
meta = with lib; {
meta = {
description = "Online stored folders (daemon version)";
homepage = "https://www.dropbox.com/";
license = licenses.unfree;
maintainers = with maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ];
homepage = "https://www.dropbox.com/";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ ttuegel ];
platforms = [
"i686-linux"
"x86_64-linux"
];
mainProgram = "dropbox";
};
}

View File

@@ -11,14 +11,14 @@
buildPythonApplication rec {
pname = "pass-git-helper";
version = "3.2.0";
version = "3.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "languitar";
repo = "pass-git-helper";
tag = "v${version}";
sha256 = "sha256-Dc7oM5xzRCdD6M/F3jetg3JA1KMTITyONd8Tf9VpU5A=";
sha256 = "sha256-Y+Y/WcVY5XrxhLoixWwsi9TMkWsJ+jXbs1rZuzo3MFo=";
};
build-system = [ setuptools ];

View File

@@ -9,14 +9,14 @@
plugins ? [ ],
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "adminer-pematon";
version = "4.13";
pname = "adminerneo";
version = "4.14";
src = fetchFromGitHub {
owner = "pematon";
repo = "adminer";
owner = "adminerneo";
repo = "adminerneo";
tag = "v${finalAttrs.version}";
hash = "sha256-7kSQl4Ch9S+680FZBsO6ynsyF1GCkT8BPpBONmeJF9U=";
hash = "sha256-GxkITh6Hh7E6qKEsCYs8M1xLeCbdI1WQqM1Zjdb6BVE=";
};
nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook preInstall
mkdir $out
cp temp/adminer-${finalAttrs.version}.php $out/adminer.php
cp export/adminer-${finalAttrs.version}.php $out/adminer.php
cp ${./index.php} $out/index.php
${lib.optionalString (theme != null) ''
@@ -58,11 +58,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
passthru = {
updateScript = nix-update-script { };
indexPHP = ./index.php;
};
meta = {
description = "Database management in a single PHP file (Pematon fork)";
homepage = "https://github.com/pematon/adminer";
description = "Database management in a single PHP file (fork of Adminer)";
homepage = "https://github.com/adminerneo/adminerneo";
license = with lib.licenses; [
asl20
gpl2Only

View File

@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "astromenace";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "viewizard";
repo = "astromenace";
rev = "v${version}";
hash = "sha256-VFFFYHsBxkURHqOBeuRuIxRKsy8baw2izOZ/qXUkiW8=";
hash = "sha256-W6d+8iw7/r2qJbE75U7egxqvK2HXaKzk+GtnspZRAxk=";
};
patches = [

View File

@@ -5,17 +5,17 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "2.0.50";
version = "2.0.53";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xXTm7/NS9XJRX/MQld7+GVOum9iW0wYfvaEve7K5cIk=";
sha256 = "sha256-VI2cz3YCOAyymJ39QJ3w3wso1nTSagKelIH/GWuMTN0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Zd4LUXPrRhz4r8C/BqnWnJOHYCnbO7uz9sqVi8hVKFI=";
cargoHash = "sha256-V1b14Xu9wJgadvGa5ID/a4gKF9FDzstT3++7NAfDibg=";
meta = with lib; {
description = "Automatically update system timezone based on location";

View File

@@ -2,22 +2,58 @@
lib,
fetchFromGitHub,
flutter327,
runCommand,
butterfly,
yq,
_experimental-update-script-combinators,
gitUpdater,
pdfium-binaries,
stdenv,
replaceVars,
}:
flutter327.buildFlutterApplication rec {
pname = "butterfly";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "LinwoodDev";
repo = "Butterfly";
tag = "v${version}";
hash = "sha256-sAgCP31Qd9XKTOvVLTazx3fqKF/FAd9WEwfcmgVqD38=";
hash = "sha256-lf1CCpLd7eM4iJvTsR2AI6xGCQ2NJ1mlYkR0hW03SRA=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
sourceRoot = "${src.name}/app";
customSourceBuilders = {
# unofficial printing
printing =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "printing";
inherit version src;
inherit (src) passthru;
patches = [
(replaceVars ./printing.patch {
inherit pdfium-binaries;
})
];
dontBuild = true;
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
};
};
gitHashes = {
dart_leap = "sha256-eEyUqdVToybQoDwdmz47H0f3/5zRdJzmPv1d/5mTOgA=";
lw_file_system = "sha256-0LLSADBWq19liQLtJIJEuTEqmeyIWP61zRRjjpdV6SM=";
@@ -31,13 +67,28 @@ flutter327.buildFlutterApplication rec {
pdf = "sha256-cIBSgePv5LIFRbc7IIx1fSVJceGEmzdZzDkOiD1z92E=";
pdf_widget_wrapper = "sha256-hXDFdgyu2DvIqwVBvk6TVDW+FdlMGAn5v5JZKQwp8fA=";
reorderable_grid = "sha256-g30DSPL/gsk0r8c2ecoKU4f1P3BF15zLnBVO6RXvDGQ=";
printing = "sha256-0JdMld1TN2EtJVQSuYdSIfi/q96roVUJEAY8dWK9xCM=";
};
postInstall = ''
cp -r linux/debian/usr/share $out/share
'';
passthru.updateScript = ./update.sh;
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
buildInputs = [ yq ];
inherit (butterfly) src;
}
''
cat $src/app/pubspec.lock | yq > $out
'';
updateScript = _experimental-update-script-combinators.sequence [
(gitUpdater { rev-prefix = "v"; })
(_experimental-update-script-combinators.copyAttrOutputToFile "butterfly.pubspecSource" ./pubspec.lock.json)
];
};
meta = {
description = "Powerful, minimalistic, cross-platform, opensource note-taking app";

View File

@@ -0,0 +1,45 @@
--- old/printing/linux/CMakeLists.txt 2024-07-16 18:45:19.000000000 +0800
+++ new/printing/linux/CMakeLists.txt 2024-10-01 01:49:05.544910894 +0800
@@ -16,6 +16,7 @@
set(PROJECT_NAME "printing")
project(${PROJECT_NAME} LANGUAGES CXX)
+set(PDFIUM_DIR @pdfium-binaries@)
set(PDFIUM_VERSION "5200" CACHE STRING "Version of pdfium used")
string(REPLACE "linux-" "" TARGET_ARCH ${FLUTTER_TARGET_PLATFORM})
set(PDFIUM_ARCH ${TARGET_ARCH} CACHE STRING "Architecture of pdfium used")
@@ -32,18 +33,11 @@
)
endif()
-# Download pdfium
-include(../windows/DownloadProject.cmake)
-download_project(PROJ
- pdfium
- URL
- ${PDFIUM_URL})
-
# This value is used when generating builds using this plugin, so it must not be
# changed
set(PLUGIN_NAME "printing_plugin")
-include(${pdfium_SOURCE_DIR}/PDFiumConfig.cmake)
+include(${PDFIUM_DIR}/PDFiumConfig.cmake)
# System-level dependencies.
find_package(PkgConfig REQUIRED)
@@ -67,7 +61,7 @@
target_link_libraries(${PLUGIN_NAME}
PRIVATE PkgConfig::GTK PkgConfig::GTKUnixPrint)
target_link_libraries(${PLUGIN_NAME} PRIVATE pdfium)
-get_filename_component(PDFium_lib_path "${PDFium_LIBRARY}" DIRECTORY)
+set(PDFium_lib_path "${PDFIUM_DIR}/lib")
set_target_properties(${PLUGIN_NAME}
PROPERTIES SKIP_BUILD_RPATH
FALSE
@@ -77,4 +71,4 @@
"$ORIGIN:${PDFium_lib_path}")
# List of absolute paths to libraries that should be bundled with the plugin
-set(printing_bundled_libraries "${PDFium_LIBRARY}" PARENT_SCOPE)
+set(printing_bundled_libraries "${PDFIUM_DIR}/lib/libpdfium.so" PARENT_SCOPE)

View File

@@ -4,11 +4,11 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
"sha256": "88399e291da5f7e889359681a8f64b18c5123e03576b01f32a6a276611e511c3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "76.0.0"
"version": "78.0.0"
},
"_macros": {
"dependency": "transitive",
@@ -20,11 +20,11 @@
"dependency": "transitive",
"description": {
"name": "analyzer",
"sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
"sha256": "62899ef43d0b962b056ed2ebac6b47ec76ffd003d5f7c4e4dc870afe63188e33",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.11.0"
"version": "7.1.0"
},
"animations": {
"dependency": "direct main",
@@ -203,7 +203,7 @@
"relative": true
},
"source": "path",
"version": "2.2.3"
"version": "2.2.4"
},
"camera": {
"dependency": "direct main",
@@ -219,31 +219,31 @@
"dependency": "transitive",
"description": {
"name": "camera_android_camerax",
"sha256": "abcfa1ac32bd03116b4cfda7e8223ab391f01966e65823c064afe388550d1b3d",
"sha256": "ecadc214daed34d8503540525d26577731c066f1993c254aa5272da7629e8f10",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.10+3"
"version": "0.6.12"
},
"camera_avfoundation": {
"dependency": "transitive",
"description": {
"name": "camera_avfoundation",
"sha256": "2e4c568f70e406ccb87376bc06b53d2f5bebaab71e2fbcc1a950e31449381bcf",
"sha256": "c3038e6e72e284b14ad246a419f26908c08f8886d114cb8a2e351988439bfa68",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.17+5"
"version": "0.9.17+6"
},
"camera_platform_interface": {
"dependency": "transitive",
"description": {
"name": "camera_platform_interface",
"sha256": "b3ede1f171532e0d83111fe0980b46d17f1aa9788a07a2fbed07366bbdbb9061",
"sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.8.0"
"version": "2.9.0"
},
"camera_web": {
"dependency": "transitive",
@@ -390,11 +390,11 @@
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
"sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.7"
"version": "3.0.1"
},
"dbus": {
"dependency": "transitive",
@@ -570,21 +570,21 @@
"dependency": "direct main",
"description": {
"name": "flex_color_scheme",
"sha256": "90f4fe67b9561ae8a4af117df65a8ce9988624025667c54e6d304e65cff77d52",
"sha256": "09bea5d776f694c5a67f2229f2aa500cc7cce369322dc6500ab01cf9ad1b4e1a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.0.2"
"version": "8.1.0"
},
"flex_seed_scheme": {
"dependency": "transitive",
"description": {
"name": "flex_seed_scheme",
"sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
"sha256": "d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.1"
"version": "3.5.0"
},
"flutter": {
"dependency": "direct main",
@@ -648,31 +648,31 @@
"dependency": "direct main",
"description": {
"name": "flutter_secure_storage",
"sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0",
"sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.2.2"
"version": "9.2.4"
},
"flutter_secure_storage_linux": {
"dependency": "transitive",
"description": {
"name": "flutter_secure_storage_linux",
"sha256": "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b",
"sha256": "bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
"version": "1.2.2"
},
"flutter_secure_storage_macos": {
"dependency": "transitive",
"description": {
"name": "flutter_secure_storage_macos",
"sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81",
"sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
"version": "3.1.3"
},
"flutter_secure_storage_platform_interface": {
"dependency": "transitive",
@@ -709,11 +709,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_svg",
"sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123",
"sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.16"
"version": "2.0.17"
},
"flutter_test": {
"dependency": "direct dev",
@@ -731,11 +731,11 @@
"dependency": "direct dev",
"description": {
"name": "freezed",
"sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
"sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.7"
"version": "2.5.8"
},
"freezed_annotation": {
"dependency": "transitive",
@@ -777,11 +777,11 @@
"dependency": "direct main",
"description": {
"name": "go_router",
"sha256": "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539",
"sha256": "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.6.2"
"version": "14.6.3"
},
"graphs": {
"dependency": "transitive",
@@ -817,11 +817,11 @@
"dependency": "transitive",
"description": {
"name": "http_parser",
"sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360",
"sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.1.1"
"version": "4.1.2"
},
"idb_shim": {
"dependency": "direct main",
@@ -913,11 +913,11 @@
"dependency": "direct dev",
"description": {
"name": "json_serializable",
"sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c",
"sha256": "8f52361c07497a7f2c16c13aac159f9be6fb12b1d67719eac98a21d9a205d571",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.9.0"
"version": "6.9.2"
},
"leak_tracker": {
"dependency": "transitive",
@@ -973,8 +973,8 @@
"dependency": "direct main",
"description": {
"path": "packages/lw_file_system",
"ref": "f29b1ae0e338ec155e1c5b0a204c399232904540",
"resolved-ref": "f29b1ae0e338ec155e1c5b0a204c399232904540",
"ref": "54f7ac141410938babff9539dca190f5d130a0db",
"resolved-ref": "54f7ac141410938babff9539dca190f5d130a0db",
"url": "https://github.com/LinwoodDev/dart_pkgs"
},
"source": "git",
@@ -984,8 +984,8 @@
"dependency": "transitive",
"description": {
"path": "packages/lw_file_system_api",
"ref": "b9d6c6173bf75247ce5a4d47fab0e48b730a9696",
"resolved-ref": "b9d6c6173bf75247ce5a4d47fab0e48b730a9696",
"ref": "5ab1b96bea6ef0e0c07629ff4e7152b4437cf8ee",
"resolved-ref": "5ab1b96bea6ef0e0c07629ff4e7152b4437cf8ee",
"url": "https://github.com/LinwoodDev/dart_pkgs"
},
"source": "git",
@@ -1016,11 +1016,11 @@
"dependency": "direct main",
"description": {
"name": "markdown",
"sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051",
"sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.2.2"
"version": "7.3.0"
},
"matcher": {
"dependency": "transitive",
@@ -1351,12 +1351,13 @@
"printing": {
"dependency": "direct main",
"description": {
"name": "printing",
"sha256": "b535d177fc6e8f8908e19b0ff5c1d4a87e3c4d0bf675e05aa2562af1b7853906",
"url": "https://pub.dev"
"path": "printing",
"ref": "4147fe72fcba3b271da02971171ff1ef71f3a7f7",
"resolved-ref": "4147fe72fcba3b271da02971171ff1ef71f3a7f7",
"url": "https://github.com/CodeDoctorDE/dart_pdf.git"
},
"source": "hosted",
"version": "5.13.4"
"source": "git",
"version": "5.14.0"
},
"process": {
"dependency": "transitive",
@@ -1392,11 +1393,11 @@
"dependency": "transitive",
"description": {
"name": "pubspec_parse",
"sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
"sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.5.0"
},
"qr": {
"dependency": "transitive",
@@ -1493,11 +1494,11 @@
"dependency": "transitive",
"description": {
"name": "sembast",
"sha256": "f45edc5e34ed53d6e3d70df664b182e9abcf9c784f48184e5be4c079d2b865d6",
"sha256": "b3dde17154b2233d039fe3c386871d2ccddb4f31e058502c4036b03858e2ff5f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.8.0+1"
"version": "3.8.1+1"
},
"share_plus": {
"dependency": "direct main",
@@ -1523,21 +1524,21 @@
"dependency": "direct main",
"description": {
"name": "shared_preferences",
"sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93",
"sha256": "a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.4"
"version": "2.3.5"
},
"shared_preferences_android": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
"sha256": "bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.4.1"
},
"shared_preferences_foundation": {
"dependency": "transitive",
@@ -1619,11 +1620,11 @@
"dependency": "transitive",
"description": {
"name": "source_gen",
"sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
"sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.0"
"version": "2.0.0"
},
"source_helper": {
"dependency": "transitive",
@@ -1699,21 +1700,21 @@
"dependency": "direct main",
"description": {
"name": "super_clipboard",
"sha256": "687ef5d4ceb2cb1e0e36a4af37683936609f424f0767b46fee5fc312b0aeb595",
"sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.0-dev.5"
"version": "0.9.0-dev.6"
},
"super_native_extensions": {
"dependency": "transitive",
"description": {
"name": "super_native_extensions",
"sha256": "1cb6baecf529300ae7f59974bdc33a53b947ecc4ce374c00126df064c10e4e51",
"sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.0-dev.5"
"version": "0.9.0-dev.6"
},
"sync_http": {
"dependency": "transitive",
@@ -1849,21 +1850,21 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_web",
"sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
"sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
"version": "2.4.0"
},
"url_launcher_windows": {
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
"sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
"sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.3"
"version": "3.1.4"
},
"uuid": {
"dependency": "transitive",
@@ -1889,11 +1890,11 @@
"dependency": "transitive",
"description": {
"name": "vector_graphics_codec",
"sha256": "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb",
"sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.12"
"version": "1.1.13"
},
"vector_graphics_compiler": {
"dependency": "transitive",
@@ -1979,11 +1980,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",
"sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.9.0"
"version": "5.10.0"
},
"win32_registry": {
"dependency": "transitive",

View File

@@ -1,20 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq yq nix bash coreutils nix-update
set -eou pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/LinwoodDev/Butterfly/releases/latest | jq --raw-output .tag_name)
latestVersion=$(echo "$latestTag" | sed 's/^v//')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; butterfly.version or (lib.getVersion butterfly)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
nix-update butterfly
curl https://raw.githubusercontent.com/LinwoodDev/Butterfly/${latestTag}/app/pubspec.lock | yq . >$ROOT/pubspec.lock.json

View File

@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.16.4";
version = "0.17.0";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
rev = version;
hash = "sha256-DykyIZBlIS4vUrD491boYcUvwcxllnV1PUT+58eOljI=";
hash = "sha256-SEcs6iYVreZXbZl29CY6orjaN440T4oIh95H93RUUxo=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-0MgQmyN9vOe7ttYzSmHJ5vS1ELSdJ2hdkgeMhSJNVTs=";
cargoHash = "sha256-egVM6ESB2CzAe4tw+4LRw1A+a/j7CSI1bUIr1EpurIM=";
nativeBuildInputs = [
pkg-config

View File

@@ -19,12 +19,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.105.0";
version = "1.106.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
hash = "sha256-1LnCvXcGDQ1pBEux2yX6crPaWdcoWbLHFALtjoGJGL0=";
hash = "sha256-uVvW8Rh4qCHJrkImHEwOySxszeKHGMGiEY5zmu3tk10=";
fetchSubmodules = true;
};

View File

@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnquery";
version = "11.39.0";
version = "11.41.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
tag = "v${version}";
hash = "sha256-xTeN6VGMqgUEsce9nh5xm5bF0tWgug/xFiXcQehP9iE=";
hash = "sha256-VOYqapmWpog/c+ON9wxmVuEG5MRthkJWIvY9QrWRprc=";
};
subPackages = [ "apps/cnquery" ];
vendorHash = "sha256-l293xIerCnsDe/mau/0+hePJ+CyDlQb1kHmB946a9Do=";
vendorHash = "sha256-IyAWTTpbyQAz85RVipNicsFVxD48IwkXWGKhXfzJido=";
ldflags = [
"-w"

View File

@@ -36,32 +36,32 @@
# the installPath using the installer:
# $ nix-env -iA conda
# $ conda-shell
# $ conda-install
# $ install-conda
#
# Under normal usage, simply call `conda-shell` to activate the FHS env,
# and then use conda commands as normal:
# $ conda-shell
# $ conda install spyder
let
version = "24.9.2";
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system}
or (throw "conda: ${stdenv.hostPlatform.system} is not supported");
version = "25.1.1";
src =
let
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system}
or (throw "conda: ${stdenv.hostPlatform.system} is not supported");
arch = selectSystem {
x86_64-linux = "x86_64";
aarch64-linux = "aarch64";
};
hash = selectSystem {
x86_64-linux = "sha256-jZNrpgAwDgjso9h03uiMYcbzkwNZeytmuu5Ur097QSI=";
aarch64-linux = "sha256-hrjfdIFkbPh+d4c+l4mtt1abWCSNOqYp6y2jXm8uLu0=";
};
in
fetchurl {
url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-0-Linux-${arch}.sh";
inherit hash;
hash = selectSystem {
x86_64-linux = "sha256-gy3ielo1t5Y/DYNGarraPrE45RmFJV8ZDg3DUEJ6ndE=";
aarch64-linux = "sha256-rp0+qD35fnj9UcRS0Lx1AFoo1QTCLbbxAAgiKT+Ra1Q=";
};
};
conda = (
@@ -70,7 +70,7 @@ let
zlib # libz.so.1
];
in
runCommand "conda-install"
runCommand "install-conda"
{
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ zlib ];
@@ -89,16 +89,18 @@ let
makeWrapper \
$out/bin/miniconda-installer.sh \
$out/bin/conda-install \
$out/bin/install-conda \
--add-flags "-p ${installationPath}" \
--add-flags "-b" \
--prefix "LD_LIBRARY_PATH" : "${libPath}"
''
);
in
buildFHSEnv {
pname = "conda-shell";
inherit version;
targetPkgs =
pkgs:
(builtins.concatLists [
@@ -106,6 +108,7 @@ buildFHSEnv {
condaDeps
extraPkgs
]);
profile = ''
# Add conda to PATH
export PATH=${installationPath}/bin:$PATH
@@ -119,7 +122,7 @@ buildFHSEnv {
# Allows `conda activate` to work properly
condaSh=${installationPath}/etc/profile.d/conda.sh
if [ ! -f $condaSh ]; then
conda-install
install-conda
fi
source $condaSh
'';

View File

@@ -2,6 +2,7 @@
lib,
buildNpmPackage,
fetchFromGitHub,
nixosTests,
}:
buildNpmPackage rec {
@@ -17,6 +18,8 @@ buildNpmPackage rec {
npmDepsHash = "sha256-hqQi0kSPm9SKEoLu6InvRMPxbQ+CBpKVPJhhOdo2ZII=";
passthru.tests.cross-seed = nixosTests.cross-seed;
meta = {
description = "Fully-automatic torrent cross-seeding with Torznab";
homepage = "https://cross-seed.org";

View File

@@ -6,7 +6,6 @@
installShellFiles,
testers,
nix-update-script,
deno,
dprint,
}:
@@ -31,18 +30,14 @@ rustPlatform.buildRustPackage rec {
installShellFiles
];
nativeCheckInputs = [
# Used in unsafe_ignore_cert test
# https://github.com/dprint/dprint/blob/00e8f5e9895147b20fe70a0e4e5437bd54d928e8/crates/dprint/src/utils/url.rs#L527
deno
];
checkFlags = [
# Require creating directory and network access
"--skip=plugins::cache_fs_locks::test"
"--skip=utils::lax_single_process_fs_flag::test"
# Require cargo is running
"--skip=utils::process::test"
# Requires deno for the testing, and making unstable results on darwin
"--skip=utils::url::test::unsafe_ignore_cert"
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

View File

@@ -14,14 +14,15 @@
webkitgtk_4_1,
glib-networking,
wrapGAppsHook3,
dpkg,
}:
stdenv.mkDerivation rec {
pname = "easyroam-connect-desktop";
version = "1.3.5";
version = "1.4.3";
src = fetchurl {
url = "http://packages.easyroam.de/repos/easyroam-desktop/pool/main/e/easyroam-desktop/easyroam_connect_desktop-${version}+${version}-linux.deb";
hash = "sha256-TRzEPPjsD1+eSuElvbTV4HJFfwfS+EH+r/OhdMP8KG0=";
url = "https://packages.easyroam.de/repos/easyroam-desktop/pool/main/e/easyroam-desktop/easyroam_connect_desktop-${version}+${version}-linux.deb";
hash = "sha256-03PLAUQQWlaAO+0cYcCorc1Q6wAhvLQGXNu0mqh8Lvw=";
};
dontConfigure = true;
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook3
dpkg
];
buildInputs = [
@@ -45,31 +47,25 @@ stdenv.mkDerivation rec {
glib-networking
];
unpackPhase = ''
ar p $src data.tar.xz | tar xJ
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r usr/share $out/share
mkdir -p $out/bin
cp -r usr/share $out/share
ln -s $out/share/easyroam_connect_desktop/easyroam_connect_desktop $out/bin/easyroam_connect_desktop
runHook postInstall
'';
meta = with lib; {
meta = {
description = "Manage and install your easyroam WiFi profiles";
mainProgram = "easyroam_connect_desktop";
longDescription = ''
Using this software you can easily connect your device to eduroam® by simply logging in with your DFN-AAI account.
'';
homepage = "https://easyroam.de";
license = licenses.unfree;
maintainers = with maintainers; [
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [
shadows_withal
MarchCraft
];

View File

@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "erg";
version = "0.6.50";
version = "0.6.51";
src = fetchFromGitHub {
owner = "erg-lang";
repo = "erg";
rev = "v${version}";
hash = "sha256-w41HLMWbWYsK+gCFhCCzu5QfHHU5jqNVcKBUvHnvpX4=";
hash = "sha256-pradjKj5luXcMZa9/p06l9H+3QTM1BrFtm23gKJv/I8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-xwJDnV2O1xpOsCZA2yb4coc/gtV5cBZh3R7lk1b1DDg=";
cargoHash = "sha256-WBEXnqi7Emv01usgeN4ktvp2Z4kqYutlYrPkR8M7U5A=";
nativeBuildInputs = [
makeWrapper

View File

@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.20.21";
version = "0.20.22";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-qMzBSGV33rQwR6snEqEXsa7cw05B3SszZH0/Fb9Yxjw=";
hash = "sha256-kWrlzXhuYrekeXYx0BX82sfyjlKn46XiVIPJP41K9qE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-+LaDGq/blYoTYIWmKtlvJe6SC8RG7PrIiYugrjchgw0=";
cargoHash = "sha256-dqpeBHUnCq9DJyREiD5dU6y4TCWkj0GXYm4eKnDkkv8=";
nativeBuildInputs = [
cmake

View File

@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fcitx5-pinyin-moegirl";
version = "20250113";
version = "20250209";
src = fetchurl {
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
hash = "sha256-Z6MqYZMpvTGcz61NnzZQy63GXfcaTWE8dezPoYht6q0=";
hash = "sha256-+EIXBIu3OE59VpnAWalmiNqD4FsvuSgRr79OQCqrgMA=";
};
dontUnpack = true;

View File

@@ -28,20 +28,20 @@
rustPlatform.buildRustPackage rec {
pname = "firefoxpwa";
version = "2.13.2";
version = "2.13.3";
src = fetchFromGitHub {
owner = "filips123";
repo = "PWAsForFirefox";
rev = "v${version}";
hash = "sha256-0VHuS507uQXaRRYjaJ9uPh1bhPrxA6PQa/x5o4IE78U=";
hash = "sha256-u6zKB5+P/f3qM5Sqmhk2ts1AhgRN8Oq877uKQuJ6Uao=";
};
sourceRoot = "${src.name}/native";
buildFeatures = [ "immutable-runtime" ];
useFetchCargoVendor = true;
cargoHash = "sha256-UxUXXF13YyS+ViEsjjfuNinq7n4W28J+fZsy/WeV6Dc=";
cargoHash = "sha256-23XTb+gAN0D67llZj8Er43cFfhLSdEA6X6V6Ds1rvV8=";
preConfigure = ''
sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml

View File

@@ -1,24 +1,25 @@
{
lib,
fetchFromGitHub,
flutter324,
flutter327,
keybinder3,
libayatana-appindicator,
buildGoModule,
makeDesktopItem,
copyDesktopItems,
wrapGAppsHook3,
autoPatchelfHook,
}:
let
pname = "flclash";
version = "0.8.70";
version = "0.8.76";
src =
(fetchFromGitHub {
owner = "chen08209";
repo = "FlClash";
tag = "v${version}";
hash = "sha256-6gDkRqbAGqwF+HCThWAHK0Jh/dxaYlnaYaAiXN48z5E=";
hash = "sha256-LNHaleqh3eAQcfYSz7xIaWeNUtmlFXOyG2S7zz2+XeI=";
fetchSubmodules = true;
}).overrideAttrs
(_: {
@@ -26,12 +27,21 @@ let
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
GIT_CONFIG_VALUE_0 = "git@github.com:";
});
metaCommon = {
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
homepage = "https://github.com/chen08209/FlClash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
};
libclash = buildGoModule {
inherit pname version src;
inherit version src;
pname = "libclash";
modRoot = "./core";
modRoot = "core";
vendorHash = "sha256-yam3DgY/dfwIRc7OvFltwX29x6xGlrrsK4Oj6oaGYRw=";
vendorHash = "sha256-p6GE97n5/ZCIjgmfL//2doRW/PGpUtjeKxhRs/aveus=";
env.CGO_ENABLED = 0;
@@ -44,22 +54,16 @@ let
runHook postBuild
'';
meta = {
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
homepage = "https://github.com/chen08209/FlClash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
};
meta = metaCommon;
};
in
flutter324.buildFlutterApplication {
flutter327.buildFlutterApplication {
inherit pname version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
nativeBuildInputs = [
copyDesktopItems
wrapGAppsHook3
autoPatchelfHook
];
@@ -88,20 +92,21 @@ flutter324.buildFlutterApplication {
];
preBuild = ''
mkdir -p ./libclash/linux/
cp ${libclash}/bin/FlClashCore ./libclash/linux/FlClashCore
mkdir -p libclash/linux
cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore
'';
postInstall = ''
install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png
install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png
'';
meta = {
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
homepage = "https://github.com/chen08209/FlClash";
passthru = {
inherit libclash;
updateScript = ./update.sh;
};
meta = metaCommon // {
mainProgram = "FlClash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}

View File

@@ -170,11 +170,11 @@
"dependency": "direct main",
"description": {
"name": "cached_network_image",
"sha256": "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819",
"sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.0"
"version": "3.4.1"
},
"cached_network_image_platform_interface": {
"dependency": "transitive",
@@ -190,11 +190,11 @@
"dependency": "transitive",
"description": {
"name": "cached_network_image_web",
"sha256": "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996",
"sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.0"
"version": "1.3.1"
},
"characters": {
"dependency": "transitive",
@@ -206,16 +206,6 @@
"source": "hosted",
"version": "1.3.0"
},
"charcode": {
"dependency": "transitive",
"description": {
"name": "charcode",
"sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.1"
},
"checked_yaml": {
"dependency": "transitive",
"description": {
@@ -270,11 +260,11 @@
"dependency": "direct main",
"description": {
"name": "connectivity_plus",
"sha256": "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3",
"sha256": "e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.0"
"version": "6.1.1"
},
"connectivity_plus_platform_interface": {
"dependency": "transitive",
@@ -336,6 +326,16 @@
"source": "hosted",
"version": "0.7.10"
},
"defer_pointer": {
"dependency": "direct main",
"description": {
"name": "defer_pointer",
"sha256": "d69e6f8c1d0f052d2616cc1db3782e0ea73f42e4c6f6122fd1a548dfe79faf02",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.0.2"
},
"device_info_plus": {
"dependency": "direct main",
"description": {
@@ -350,11 +350,11 @@
"dependency": "transitive",
"description": {
"name": "device_info_plus_platform_interface",
"sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
"sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.1"
"version": "7.0.2"
},
"dio": {
"dependency": "direct main",
@@ -396,6 +396,16 @@
"source": "hosted",
"version": "0.0.5"
},
"equatable": {
"dependency": "transitive",
"description": {
"name": "equatable",
"sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.7"
},
"fake_async": {
"dependency": "transitive",
"description": {
@@ -440,21 +450,21 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3",
"sha256": "c2376a6aae82358a9f9ccdd7d1f4006d08faa39a2767cce01031d9f593a8bd3b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.0.7"
"version": "8.1.6"
},
"file_selector_linux": {
"dependency": "transitive",
"description": {
"name": "file_selector_linux",
"sha256": "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2",
"sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.3"
"version": "0.9.3+2"
},
"file_selector_macos": {
"dependency": "transitive",
@@ -690,16 +700,6 @@
"source": "hosted",
"version": "4.0.2"
},
"image": {
"dependency": "direct main",
"description": {
"name": "image",
"sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.3.0"
},
"image_picker": {
"dependency": "direct main",
"description": {
@@ -714,11 +714,11 @@
"dependency": "transitive",
"description": {
"name": "image_picker_android",
"sha256": "8faba09ba361d4b246dc0a17cb4289b3324c2b9f6db7b3d457ee69106a86bd32",
"sha256": "fa8141602fde3f7e2f81dbf043613eb44dfa325fa0bcf93c0f142c9f7a2c193e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.12+17"
"version": "0.8.12+18"
},
"image_picker_for_web": {
"dependency": "transitive",
@@ -794,31 +794,31 @@
"dependency": "transitive",
"description": {
"name": "io",
"sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
"sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.4"
"version": "1.0.5"
},
"isolate_contactor": {
"dependency": "transitive",
"description": {
"name": "isolate_contactor",
"sha256": "f1be0a90f91e4309ef37cc45280b2a84e769e848aae378318dd3dd263cfc482a",
"sha256": "6ba8434ceb58238a1389d6365111a3efe7baa1c68a66f4db6d63d351cf6c3a0f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.2.0"
"version": "4.1.0"
},
"isolate_manager": {
"dependency": "transitive",
"description": {
"name": "isolate_manager",
"sha256": "8fb916c4444fd408f089448f904f083ac3e169ea1789fd4d987b25809af92188",
"sha256": "22ed0c25f80ec3b5f21e3a55d060f4650afff33f27c2dff34c0f9409d5759ae5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.3.1"
"version": "4.1.5+1"
},
"js": {
"dependency": "transitive",
@@ -844,11 +844,11 @@
"dependency": "direct dev",
"description": {
"name": "json_serializable",
"sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
"sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.8.0"
"version": "6.9.0"
},
"launch_at_startup": {
"dependency": "direct main",
@@ -1024,31 +1024,31 @@
"dependency": "transitive",
"description": {
"name": "package_config",
"sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
"sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.1.1"
},
"package_info_plus": {
"dependency": "direct main",
"description": {
"name": "package_info_plus",
"sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce",
"sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.1.1"
"version": "8.1.2"
},
"package_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "package_info_plus_platform_interface",
"sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
"sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
"version": "3.0.2"
},
"path": {
"dependency": "direct main",
@@ -1074,21 +1074,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a",
"sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.12"
"version": "2.2.15"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
"sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
"sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.4.1"
},
"path_provider_linux": {
"dependency": "transitive",
@@ -1164,11 +1164,11 @@
"dependency": "direct main",
"description": {
"name": "process_run",
"sha256": "5736140acb1c54a11bd4c1e8d4821bfd684de69a4bf88835316cb05e596d8091",
"sha256": "a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.2"
"version": "1.2.2+1"
},
"provider": {
"dependency": "direct main",
@@ -1193,11 +1193,11 @@
"dependency": "transitive",
"description": {
"name": "pub_semver",
"sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
"sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.1.5"
},
"pubspec_parse": {
"dependency": "transitive",
@@ -1303,31 +1303,31 @@
"dependency": "direct main",
"description": {
"name": "shared_preferences",
"sha256": "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82",
"sha256": "688ee90fbfb6989c980254a56cb26ebe9bb30a3a2dff439a78894211f73de67a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
"version": "2.5.1"
},
"shared_preferences_android": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab",
"sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
"version": "2.4.0"
},
"shared_preferences_foundation": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_foundation",
"sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
"sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.3"
"version": "2.5.4"
},
"shared_preferences_linux": {
"dependency": "transitive",
@@ -1383,11 +1383,11 @@
"dependency": "transitive",
"description": {
"name": "shelf_web_socket",
"sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
"sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.0.1"
},
"shortid": {
"dependency": "transitive",
@@ -1469,11 +1469,11 @@
"dependency": "transitive",
"description": {
"name": "sqflite_common",
"sha256": "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490",
"sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4+5"
"version": "2.5.4+6"
},
"sqflite_darwin": {
"dependency": "transitive",
@@ -1569,11 +1569,11 @@
"dependency": "transitive",
"description": {
"name": "timing",
"sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
"sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
"version": "1.0.2"
},
"tray_manager": {
"dependency": "direct main",
@@ -1629,31 +1629,31 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
"sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.1"
"version": "6.3.2"
},
"url_launcher_linux": {
"dependency": "transitive",
"description": {
"name": "url_launcher_linux",
"sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
"sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.0"
"version": "3.2.1"
},
"url_launcher_macos": {
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",
"sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
"version": "3.2.2"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -1729,11 +1729,11 @@
"dependency": "transitive",
"description": {
"name": "web",
"sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
"sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.1"
"version": "1.1.0"
},
"web_socket": {
"dependency": "transitive",
@@ -1769,11 +1769,11 @@
"dependency": "direct main",
"description": {
"name": "win32",
"sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2",
"sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.8.0"
"version": "5.9.0"
},
"win32_registry": {
"dependency": "direct main",
@@ -1853,16 +1853,6 @@
},
"source": "hosted",
"version": "2.2.1"
},
"zxing2": {
"dependency": "direct main",
"description": {
"name": "zxing2",
"sha256": "6cf995abd3c86f01ba882968dedffa7bc130185e382f2300239d2e857fc7912c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.3"
}
},
"sdks": {

View File

@@ -0,0 +1,20 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
set -eou pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
latestVersion=$(echo "$latestTag" | sed 's/^v//')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flclash.version or (lib.getVersion flclash)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
nix-update --subpackage libclash flclash
curl https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json

View File

@@ -0,0 +1,35 @@
{
lib,
fetchFromGitHub,
flutter324,
}:
flutter324.buildFlutterApplication rec {
pname = "flut-renamer";
version = "1.5.4";
src = fetchFromGitHub {
owner = "sun-jiao";
repo = "flut-renamer";
tag = version;
hash = "sha256-maPmZwsmmjyvHgutWF+8CIw2NA6HCB4/PPiiCAG+n8I=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
postInstall = ''
install -Dm644 assets/desktop.png $out/share/pixmaps/flut-renamer.png
install -Dm644 appimage/flut-renamer.desktop $out/share/applications/flut-renamer.desktop
substituteInPlace $out/share/applications/flut-renamer.desktop \
--replace-fail "Icon=desktop" "Icon=flut-renamer"
'';
meta = {
description = "Bulk file renamer written in flutter";
homepage = "https://github.com/sun-jiao/flut-renamer";
mainProgram = "flut-renamer";
platforms = lib.platforms.linux;
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ nayeko ];
};
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,34 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p yq nix bash coreutils nix-update common-updater-scripts ripgrep flutter
set -eou pipefail
PACKAGE_DIR="$(realpath "$(dirname "$0")")"
cd "$PACKAGE_DIR"/..
while ! test -f flake.nix; do cd ..; done
NIXPKGS_DIR="$PWD"
latestVersion=$(
list-git-tags --url=https://github.com/sun-jiao/flut-renamer |
rg '^v(.*)' -r '$1' |
sort --version-sort |
tail -n1
)
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flut-renamer.version or (lib.getVersion flut-renamer)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
nix-update --version=$latestVersion flut-renamer
export HOME="$(mktemp -d)"
src="$(nix-build --no-link "$NIXPKGS_DIR" -A flut-renamer.src)"
TMPDIR="$(mktemp -d)"
cp --recursive --no-preserve=mode "$src"/* $TMPDIR
cd $TMPDIR
flutter pub get
yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json
rm -rf $TMPDIR

View File

@@ -6,18 +6,18 @@
}:
rustPlatform.buildRustPackage rec {
pname = "flutter_rust_bridge_codegen";
version = "2.7.1";
version = "2.8.0";
src = fetchFromGitHub {
owner = "fzyzcjy";
repo = "flutter_rust_bridge";
rev = "v${version}";
hash = "sha256-I9IaBOqX93g5i26aMa/ICWKurX/82R9PvINNVWNQuNk=";
hash = "sha256-amjfreJq/GC/Xou39i2IIIGI1ukpiWRx3bddxVQB6dk=";
fetchSubmodules = true;
};
useFetchCargoVendor = true;
cargoHash = "sha256-8+h2B3q3cFH7lLilathipnSJKx5nAts0EiUUiqFENFU=";
cargoHash = "sha256-zRiyLFDRqhi6TUt/UfWvgJ2hqWdUz8jxUCvN5RDp1Bk=";
cargoBuildFlags = "--package flutter_rust_bridge_codegen";
cargoTestFlags = "--package flutter_rust_bridge_codegen";

View File

@@ -11,17 +11,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "fum";
version = "0.9.17";
version = "1.0.1";
src = fetchFromGitHub {
owner = "qxb3";
repo = "fum";
tag = "v${version}";
hash = "sha256-E9Z8bs5bdNcXHRJIkzcISIz8R1wnZu8sO6tXQp+5bpQ=";
hash = "sha256-0359ThCHM14uSQFNoKWm88Bk3aOxyhkulSvoXcpNJMc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-yrDukkbbXqS2iAdtY4WZS6VkqSbyeBXWkn2Od4+mWLw=";
cargoHash = "sha256-XyMf9v9Pfl+j2E1BnNl8SkDvu/0LZ6av9/dsDc0zA8U=";
nativeBuildInputs = [
autoPatchelfHook

View File

@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gitify";
version = "5.18.0";
version = "6.1.0";
src = fetchFromGitHub {
owner = "gitify-app";
repo = "gitify";
tag = "v${finalAttrs.version}";
hash = "sha256-INeOQY39IepcqigThymEcBjkrQkIC/9Py+g32/VBpmg=";
hash = "sha256-3vpt8irwDYdWqX4Vt7WdmQfePqIRkv07LootFLaQGZI=";
};
nativeBuildInputs = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-86RiBzZwoyDX5l9wV3JiUo4efkol3sKH3tlu61D7D+0=";
hash = "sha256-HW8v5DhbWXmMU2vD2NutbY7eMVzeW1FzYXOs3NRsUw0=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

View File

@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.23.3";
version = "8.24.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = "gitleaks";
tag = "v${version}";
hash = "sha256-K1TjgpV6e3R5QJGglU47G/eNRDexIpPcy0x5+XmkqrQ=";
hash = "sha256-4LkM65njb2L8aCLBmKo18gNXX93zXCGh/e/+xdS+wek=";
};
vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA=";
vendorHash = "sha256-J9cQUXVDqSTykoUOCaKGgyYzkcv7Uss6tNra42Sofw8=";
ldflags = [
"-s"

View File

@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "go-critic";
version = "0.11.5";
version = "0.12.0";
src = fetchFromGitHub {
owner = "go-critic";
repo = "go-critic";
rev = "v${version}";
hash = "sha256-KH7jawMd73qdl1S+YQlQGW/2Vj8XjMLJ15Hz0cdwDO4=";
hash = "sha256-iGJ2GPag79HSdwCJOuUn86fEe1/NhmPXVRCCYeWokGw=";
};
vendorHash = "sha256-vBGCFnKKpMcM7RWmT05oPwCItR4QMHhTAZ8x2ejJpcI=";
vendorHash = "sha256-DhjXu/9Cv/pcBuC83Hc2PpgvN9k445WOr1IBkxtmQlw=";
subPackages = [
"cmd/gocritic"

View File

@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "go-dnscollector";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "dmachard";
repo = "go-dnscollector";
rev = "v${version}";
sha256 = "sha256-kpVPQOeWlzJ2u04jHgLimZJcl/XkD+Tiok9LEcFywdU=";
sha256 = "sha256-JhkvWj5mQlFiGQ2A0yGIr0/4g9mYlWnK5DQfeSRX+Qo=";
};
vendorHash = "sha256-qAybkMVHxzNJalm1203Ox082PIRnveypzaKoibm7zlY=";
vendorHash = "sha256-crOswUMoFKsDdo8HiChSRSeR0eHHC1f8G6OcPuUGoww=";
subPackages = [ "." ];

View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "go-minimock";
version = "3.4.4";
version = "3.4.5";
src = fetchFromGitHub {
owner = "gojuno";
repo = "minimock";
rev = "v${version}";
hash = "sha256-pXSi5gdEqTrvSOQ2yJysowRKJ0bZjhgCkV9Vxx1J5Lk=";
hash = "sha256-D5U1KfWXe9qtcFQKDoISC6Hq5axMO37WsyFjpPOyyo4=";
};
ldflags = [
@@ -21,7 +21,7 @@ buildGoModule rec {
"-X main.version=${version}"
];
vendorHash = "sha256-zk5ulVxn7qAsU5i5z6eG0OMN5ExSu/ceBKu8UMwoiPo=";
vendorHash = "sha256-MN/tHT+vjLswUxe+c3FZn+S0l+fklqnIvj4BnPfbOjw=";
doCheck = true;

View File

@@ -171,11 +171,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "133.0.6943.98";
version = "133.0.6943.126";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-UHpt9ToxrE2VA3c5+zOpMYpKWPRWIIeCErIZwEWkfqg=";
hash = "sha256-B1kPoPMgPOwusxosWzge4d6jQwV0A10fwL2gcrzYu/4=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -274,11 +274,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "133.0.6943.99";
version = "133.0.6943.127";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/adux5id3nnmm6yel34xr47dlcova_133.0.6943.99/GoogleChrome-133.0.6943.99.dmg";
hash = "sha256-fcwFpGgbojvB1269/aWLNcj9JnzB0WlNimpYNETIyE8=";
url = "http://dl.google.com/release2/chrome/ac4k2kxfjhk4ggh2tvxk4t47hl7q_133.0.6943.127/GoogleChrome-133.0.6943.127.dmg";
hash = "sha256-baWFgjwcHg1Y3jNdIpcARFoaK0GZgqFe0bM2xtXsJtA=";
};
dontPatch = true;

View File

@@ -0,0 +1,4 @@
#!/bin/sh
set -eu
export GPG_TTY=$(tty)
exec @OUT@/bin/gopass-jsonapi listen

View File

@@ -5,10 +5,26 @@
buildGoModule,
fetchFromGitHub,
installShellFiles,
jq,
gnupg,
gopass,
apple-sdk_14,
}:
let
# https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/internal/jsonapi/manifest/manifest_path_linux.go
manifestPaths = {
firefox = "$out/lib/mozilla/native-messaging-hosts/com.justwatch.gopass.json";
chrome = "$out/etc/opt/chrome/native-messaging-hosts/com.justwatch.gopass.json";
chromium = "$out/etc/chromium/native-messaging-hosts/com.justwatch.gopass.json";
brave = "$out/etc/opt/chrome/native-messaging-hosts/com.justwatch.gopass.json";
vivaldi = "$out/etc/opt/vivaldi/native-messaging-hosts/com.justwatch.gopass.json";
iridium = "$out/etc/iridium-browser/native-messaging-hosts/com.justwatch.gopass.json";
slimjet = "$out/etc/opt/slimjet/native-messaging-hosts/com.justwatch.gopass.json";
};
in
buildGoModule rec {
pname = "gopass-jsonapi";
version = "1.15.15";
@@ -41,6 +57,46 @@ buildGoModule rec {
"-X main.commit=${src.rev}"
];
postInstall = ''
# Generate native messaging manifests for Chrome and Firefox.
export HOME=$(mktemp -d)
${gnupg}/bin/gpg --batch --passphrase "" --quick-generate-key "user <user@localhost>"
${gopass}/bin/gopass setup --name "user" --email "user@localhost"
${lib.concatMapStrings (
browser:
let
manifestPath = manifestPaths.${browser};
in
# The options after `--print=false` are of no effect, but if missing
# `gopass-jsonapi configure` will ask for them. (`--libpath` and `--global`
# are overriden by `--manifest-path`. `--libpath` is only used to
# compute Firefox's global manifest path. See
# https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/setup_others.go#L33-L46)
#
# `gopass-jsonapi configure` ask for confirmation before writing any files,
# `echo y` gives it.
# Prepend $PATH so we can run gopass-jsonapi before wrapProgram in postFixup.
''
echo y | PATH="${gopass.wrapperPath}:$PATH" $out/bin/gopass-jsonapi configure \
--browser ${browser} \
--path $out/lib/gopass \
--manifest-path ${manifestPath} \
--print=false \
--global \
--libpath /var/empty
# replace gopass_wrapper.sh with ./browser-jsonapi-wrapper.sh
rm $out/lib/gopass/gopass_wrapper.sh
${jq}/bin/jq --arg script $out/lib/gopass/browser-jsonapi-wrapper.sh \
'.path = $script' ${manifestPath} > ${manifestPath}.tmp
mv ${manifestPath}.tmp ${manifestPath}
''
) (builtins.attrNames manifestPaths)}
substitute ${./browser-jsonapi-wrapper.sh} $out/lib/gopass/browser-jsonapi-wrapper.sh \
--replace-fail "@OUT@" "$out"
chmod +x $out/lib/gopass/browser-jsonapi-wrapper.sh
'';
postFixup = ''
wrapProgram $out/bin/gopass-jsonapi \
--prefix PATH : "${gopass.wrapperPath}"

View File

@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "gql";
version = "0.35.0";
version = "0.36.0";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
hash = "sha256-3aIZZvOmmGOa1+QHz7VrhLeEcyHSbsUMdD3PAqPpXVY=";
hash = "sha256-KVyd59NHDkUdbSNkru7uEWI46RMbWUO6lRf7xMYEaWs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-cAX6AEQlEmPqG7TxD8tzQ5/KSE4VOWaoTA2ZHQwdKRs=";
cargoHash = "sha256-eDJJ0Gcd3VJjqp3XbHwgQRSE/Ut5zSEumvvdgb31r+8=";
nativeBuildInputs = [
pkg-config

View File

@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
hash = "sha256-f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";
extraPrefix = "";
})
# Resolves a GCC14 missing typecast error
./typecast.diff
];
passthru = {

View File

@@ -0,0 +1,13 @@
diff --git a/components/editor/gtkhtml-editor.c b/components/editor/gtkhtml-editor.c
index 902baf94..d885df8c 100644
--- a/components/editor/gtkhtml-editor.c
+++ b/components/editor/gtkhtml-editor.c
@@ -455,7 +455,7 @@ editor_set_html (GtkhtmlEditor *editor,
gtk_html_load_empty (html);
gtk_html_set_editable (html, TRUE);
- editor->priv->edit_area = g_object_ref_sink (html);
+ editor->priv->edit_area = (GtkWidget *) g_object_ref_sink (html);
}
static GObject *

View File

@@ -12,17 +12,26 @@
autoPatchelfHook,
makeDesktopItem,
copyDesktopItems,
replaceVars,
nix-update-script,
}:
let
pname = "gui-for-singbox";
version = "1.9.0";
version = "1.9.3";
src = fetchFromGitHub {
owner = "GUI-for-Cores";
repo = "GUI.for.SingBox";
tag = "v${version}";
hash = "sha256-5zd4CVWVR+E3E097Xjd/V6QFRV9Ye2UQvBalAQ9zqXc=";
hash = "sha256-3ZSQoSXa9ma+r6y/xQGPjDw3BryH/s3TEEN2KptN+f8=";
};
metaCommon = {
description = "SingBox GUI program developed by vue3 + wails";
homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
frontend = stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +45,7 @@ let
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/frontend";
hash = "sha256-dLI1YMzs9lLk9lJBkBgc6cpirM79khy0g5VaOVEzUAc=";
hash = "sha256-IljvA3vVD7RXULPWvKJPp4fi094SDDPs/AlxJKOk6OY=";
};
sourceRoot = "${finalAttrs.src.name}/frontend";
@@ -52,19 +61,15 @@ let
installPhase = ''
runHook preInstall
cp -r ./dist $out
cp -r dist $out
runHook postInstall
'';
meta = {
description = "GUI program developed by vue3";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
meta = metaCommon;
});
in
buildGoModule {
inherit pname version src;
@@ -76,7 +81,7 @@ buildGoModule {
--replace-fail '@basepath@' "$out"
'';
vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs=";
vendorHash = "sha256-Ft3qkxCAkNIqTapqT4g8w0L8VV3z30GwWb17kGr03jw=";
nativeBuildInputs = [
wails
@@ -90,6 +95,18 @@ buildGoModule {
libsoup_3
];
preBuild = ''
cp -r ${frontend} frontend/dist
'';
buildPhase = ''
runHook preBuild
wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.SingBox
runHook postBuild
'';
desktopItems = [
(makeDesktopItem {
name = "gui-for-singbox";
@@ -106,33 +123,26 @@ buildGoModule {
})
];
preBuild = ''
cp -r ${frontend} ./frontend/dist
'';
buildPhase = ''
runHook preBuild
wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.SingBox
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm 0755 ./build/bin/GUI.for.SingBox $out/bin/GUI.for.SingBox
install -Dm 0755 build/bin/GUI.for.SingBox $out/bin/GUI.for.SingBox
install -Dm 0644 build/appicon.png $out/share/pixmaps/gui-for-singbox.png
runHook postInstall
'';
meta = {
description = "SingBox GUI program developed by vue3 + wails";
homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox";
passthru = {
inherit frontend;
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"frontend"
];
};
};
meta = metaCommon // {
mainProgram = "GUI.for.SingBox";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}

View File

@@ -0,0 +1,44 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "h5glance";
version = "0.9";
pyproject = true;
src = fetchFromGitHub {
owner = "European-XFEL";
repo = "h5glance";
tag = version;
hash = "sha256-20gSaNZrH3AeFTGLho6sbWljfqln9SQEVdvEVe/WaYY=";
};
build-system = [
python3.pkgs.flit-core
];
dependencies = with python3.pkgs; [
h5py
htmlgen
];
nativeCheckInputs = [
python3.pkgs.pytestCheckHook
];
pythonImportsCheck = [
"h5glance"
];
meta = {
description = "Explore HDF5 files in terminal & HTML views";
homepage = "https://github.com/European-XFEL/h5glance";
changelog = "https://github.com/European-XFEL/h5glance/blob/${src.rev}/CHANGES.rst";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ doronbehar ];
mainProgram = "h5glance";
};
}

View File

@@ -35,11 +35,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "haproxy";
version = "3.1.3";
version = "3.1.4";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
hash = "sha256-bdIfmkHw7HKJZQ4pkYC2T53SJeNRE/0b3cajouedUXI=";
hash = "sha256-nom9ByiyadIA3P483vO1yLIepovxStieOm92vacB5/4=";
};
buildInputs =

View File

@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "harbor-cli";
version = "0.0.2";
version = "0.0.3";
src = fetchFromGitHub {
owner = "goharbor";
repo = "harbor-cli";
rev = "v${version}";
hash = "sha256-baS4UHjmE2eURFMDBhXbx9lcKPArb2RH2NVDt3MPE4s=";
hash = "sha256-Vfr7e5UQ34TkirywuYJPrkxRA6yJp3/ivfCJOnh34MY=";
};
vendorHash = "sha256-rw2VPRi0VTm7/zVnQ8zL5f4mbzYKnmuxgCbgrpcukaU=";
vendorHash = "sha256-zQV3YJJ5cu24SVS6LCuZbM5EfGZyNPt8f1N0B3befD0=";
excludedPackages = [ "dagger" ];

View File

@@ -3,25 +3,48 @@
lib,
fetchFromGitHub,
flutter324,
pkg-config,
makeDesktopItem,
libayatana-appindicator,
copyDesktopItems,
mpv,
runCommand,
_experimental-update-script-combinators,
harmony-music,
gitUpdater,
yq,
jdk,
}:
flutter324.buildFlutterApplication rec {
pname = "harmony-music";
version = "1.10.31";
version = "1.11.2";
src = fetchFromGitHub {
owner = "anandnet";
repo = "Harmony-Music";
tag = "v${version}";
hash = "sha256-hHwkBNqYcwYlez3SCdc+I+LKyduHU93LCFaAZqpKIO4=";
hash = "sha256-oLtdQWjBM2gRxBJzO++hoXeyvcALu6R4eA7nswQpuqw=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
just_audio_media_kit = "sha256-cNuKwOAEcFCTfbKhvBvYAdmD5qFeNW16jc3A+6ID3bM=";
sidebar_with_animation = "sha256-Y7dTO4wN7cOmm2mnzQPW/gDYltLr7wMKMXbGtAg8WzY=";
youtube_explode_dart = "sha256-+3j+B+Ea1l/SzR8ZLp0vLYco77hkwn9VKRPvDeHqIeY=";
terminate_restart = "sha256-NiznKbko9f2yWcI62MA2xc/NQgy/31fYqK0COHR1Wpk=";
};
nativeBuildInputs = [
copyDesktopItems
autoPatchelfHook
];
buildInputs = [
libayatana-appindicator
jdk
];
desktopItems = [
(makeDesktopItem {
name = "harmony-music";
@@ -40,36 +63,30 @@ flutter324.buildFlutterApplication rec {
})
];
nativeBuildInputs = [
copyDesktopItems
pkg-config
autoPatchelfHook
];
buildInputs = [
libayatana-appindicator
];
gitHashes = {
device_equalizer = "sha256-fvS611D/0U5yJC5i88JdyVNhJozt8tXPhgkkvHgIDRo=";
just_audio_media_kit = "sha256-cNuKwOAEcFCTfbKhvBvYAdmD5qFeNW16jc3A+6ID3bM=";
player_response = "sha256-4Lc6yelLzYjH3K9rzzHHJ1XDyAyQK1xFGfj/rC7wAkg=";
sdk_int = "sha256-ABlghY7RE/E/1G7xP10LuVSWPxbg4jyfLon8XMv8rYo=";
sidebar_with_animation = "sha256-Y7dTO4wN7cOmm2mnzQPW/gDYltLr7wMKMXbGtAg8WzY=";
};
postInstall = ''
install -Dm644 ./assets/icons/icon.png $out/share/pixmaps/harmony-music.png
install -Dm644 assets/icons/icon.png $out/share/pixmaps/harmony-music.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/harmony-music/lib:${
lib.makeLibraryPath [
mpv
]
}"
--prefix LD_LIBRARY_PATH : $out/app/harmony-music/lib:${lib.makeLibraryPath [ mpv ]}
'';
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
buildInputs = [ yq ];
inherit (harmony-music) src;
}
''
cat $src/pubspec.lock | yq > $out
'';
updateScript = _experimental-update-script-combinators.sequence [
(gitUpdater { rev-prefix = "v"; })
(_experimental-update-script-combinators.copyAttrOutputToFile "harmony-music.pubspecSource" ./pubspec.lock.json)
];
};
meta = {
description = "Cross platform App for streaming Music";
homepage = "https://github.com/anandnet/Harmony-Music";

File diff suppressed because it is too large Load Diff

View File

@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hcledit";
version = "0.2.16";
version = "0.2.17";
src = fetchFromGitHub {
owner = "minamijoyo";
repo = pname;
rev = "v${version}";
hash = "sha256-ULoqb9+GQB+Rg5p/Lqa1gHvZDDAmcfNE6FOK/R5mVK8=";
hash = "sha256-4PBEcOK16YXQhrQ6Yrtcb6vTE6h6sSY3Ymuxi+mEUt8=";
};
vendorHash = "sha256-V7Ppb5u6to8bc0TWgJirC04N9lMOYav/dgEPWHzvGro=";
vendorHash = "sha256-d1cxzGVBOwNAoOxGanRJas4jocxj6B6k5C1hxZi7/Ak=";
meta = with lib; {
description = "Command line editor for HCL";

File diff suppressed because it is too large Load Diff

View File

@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "hdr10plus_tool";
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "quietvoid";
repo = "hdr10plus_tool";
tag = version;
hash = "sha256-eP77LHADP9oenMACctPKU6xPzg4atC0dPOqyrFse/1s=";
hash = "sha256-eueB+ZrOrnySEwUpCTvC4qARCsDcHJhm088XepLTlOE=";
};
cargoLock = {

View File

@@ -1,51 +1,50 @@
{
lib,
fetchFromGitHub,
pkg-config,
flutter324,
buildGoModule,
libayatana-appindicator,
makeDesktopItem,
copyDesktopItems,
wrapGAppsHook3,
autoPatchelfHook,
}:
let
pname = "hiddify-app";
version = "2.5.7-unstable-2024-11-18";
src = fetchFromGitHub {
owner = "hiddify";
repo = "hiddify-app";
rev = "9d3de0ae2ea2687f189f75fa2a9196a035a0bb32";
hash = "sha256-P04A14lFfgvl0kkxMsNXNaHnwfJ3AWkhrfI7VMESGHc=";
fetchSubmodules = true;
};
libcore = buildGoModule rec {
inherit pname version src;
modRoot = "./libcore";
let
metaCommon = {
description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc";
license = with lib.licenses; [
unfree # upstream adds non-free additional conditions. https://github.com/hiddify/hiddify-app/blob/0f6b15057f626016fcd7a0c075f1c8c2f606110a/LICENSE.md#additional-conditions-to-gpl-v3
gpl3Only
];
maintainers = with lib.maintainers; [ ];
};
libcore = buildGoModule rec {
pname = "hiddify-core";
version = "3.1.8";
src = fetchFromGitHub {
owner = "hiddify";
repo = "hiddify-core";
tag = "v${version}";
hash = "sha256-NRzzkC3xbRVP20Pm29bHf8YpxmnjISgF46c8l9qU4rA=";
};
vendorHash = "sha256-a7NFZt4/w2+oaZG3ncaOrrhASxUptcWS/TeaIQrgLe4=";
GO_PUBLIC_FLAGS = ''
GO_BUILD_FLAGS = ''
-tags "with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc" \
-trimpath \
-ldflags "-s -w" \
'';
postPatch = ''
sed -i '/import (/a\ \t"os"\n\t"path/filepath"' ./libcore/v2/db/hiddify_db.go
substituteInPlace ./libcore/v2/db/hiddify_db.go \
--replace-fail 'NewGoLevelDBWithOpts(name, "./data", ' 'NewGoLevelDBWithOpts(name, filepath.Join(os.Getenv("HOME"), ".local", "share", "app.hiddify.com", "data"), '
'';
buildPhase = ''
runHook preBuild
go build ${GO_PUBLIC_FLAGS} -buildmode=c-shared -o bin/lib/libcore.so ./custom
go build ${GO_BUILD_FLAGS} -buildmode=c-shared -o bin/lib/libcore.so ./custom
mkdir lib
cp bin/lib/libcore.so ./lib/libcore.so
CGO_LDFLAGS="./lib/libcore.so" go build ${GO_PUBLIC_FLAGS} -o bin/HiddifyCli ./cli/bydll
CGO_LDFLAGS="./lib/libcore.so" go build ${GO_BUILD_FLAGS} -o bin/HiddifyCli ./cli/bydll
runHook postBuild
'';
@@ -53,53 +52,62 @@ let
installPhase = ''
runHook preInstall
install -Dm0755 ./bin/HiddifyCli $out/bin/HiddifyCli
install -Dm0755 ./lib/libcore.so $out/lib/libcore.so
install -Dm0755 bin/HiddifyCli $out/bin/HiddifyCli
install -Dm0755 lib/libcore.so $out/lib/libcore.so
runHook postInstall
'';
meta = {
description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc";
homepage = "https://hiddify.com";
meta = metaCommon // {
homepage = "https://github.com/hiddify/hiddify-core";
mainProgram = "HiddifyCli";
license = lib.licenses.cc-by-nc-sa-40;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
};
};
in
flutter324.buildFlutterApplication {
inherit pname version src;
pname = "hiddify-app";
version = "2.5.7-unstable-2025-01-06";
src = fetchFromGitHub {
owner = "hiddify";
repo = "hiddify-app";
rev = "a7547d298a5f8058446b6a470e56fe4efa3c1ccd";
hash = "sha256-5I/k2KxdWiNsgwJY+bqMVqtC2eGshKbpLYzsPrmvhmY=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
circle_flags = "sha256-dqORH4yj0jU8r9hP9NTjrlEO0ReHt4wds7BhgRPq57g=";
flutter_easy_permission = "sha256-fs2dIwFLmeDrlFIIocGw6emOW1whGi9W7nQ7mHqp8R0=";
humanizer = "sha256-zsDeol5l6maT8L8R6RRtHyd7CJn5908nvRXIytxiPqc=";
};
postPatch = ''
substituteInPlace linux/my_application.cc \
--replace-fail "./hiddify.png" "${placeholder "out"}/share/pixmaps/hiddify.png"
'';
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
];
buildInputs = [
libayatana-appindicator
];
nativeBuildInputs = [
pkg-config
autoPatchelfHook
wrapGAppsHook3
copyDesktopItems
];
postPatch = ''
substituteInPlace ./linux/my_application.cc \
--replace-fail "./hiddify.png" "${placeholder "out"}/share/pixmaps/hiddify.png"
'';
preBuild = ''
mkdir -p libcore/bin
cp -r ${libcore}/lib libcore/bin/lib
cp ${libcore}/bin/HiddifyCli libcore/bin/HiddifyCli
packageRun build_runner build --delete-conflicting-outputs
packageRun slang
'';
postInstall = ''
install -Dm0644 ./assets/images/source/ic_launcher_border.png $out/share/pixmaps/hiddify.png
'';
flutterBuildFlags = [
"--target lib/main_prod.dart"
];
desktopItems = [
(makeDesktopItem {
@@ -124,30 +132,21 @@ flutter324.buildFlutterApplication {
})
];
flutterBuildFlags = [
"--target lib/main_prod.dart"
];
gitHashes = {
circle_flags = "sha256-dqORH4yj0jU8r9hP9NTjrlEO0ReHt4wds7BhgRPq57g=";
flutter_easy_permission = "sha256-fs2dIwFLmeDrlFIIocGw6emOW1whGi9W7nQ7mHqp8R0=";
humanizer = "sha256-zsDeol5l6maT8L8R6RRtHyd7CJn5908nvRXIytxiPqc=";
};
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
postInstall = ''
install -Dm0644 assets/images/source/ic_launcher_border.png $out/share/pixmaps/hiddify.png
'';
preFixup = ''
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/${pname}/lib/lib*.so
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/hiddify-app/lib/lib*.so
'';
meta = {
description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc";
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : $out/app/hiddify-app/lib
'';
meta = metaCommon // {
homepage = "https://hiddify.com";
mainProgram = "hiddify";
license = lib.licenses.cc-by-nc-sa-40;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
};
}

View File

@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "hwloc";
version = "2.11.2";
version = "2.12.0";
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
hash = "sha256-9/iP7K4GcQDxoakVtlit0PT3FWEllIKRCmm66iL+hAk=";
hash = "sha256-BqCivcClcU6DkWRoOEag6TaoliE3WOnTfkniMricWNQ=";
};
configureFlags = [

View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hyprutils";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprutils";
tag = "v${finalAttrs.version}";
hash = "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=";
hash = "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=";
};
nativeBuildInputs = [

View File

@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "i2p";
version = "2.8.0";
version = "2.8.1";
src = fetchzip {
urls =
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://files.i2p-projekt.de/"
"https://download.i2p2.no/releases/"
]);
hash = "sha256-Gw60l6aB9EcDxWowSHUF8LIoxs5bYamJYTVGKQI2V80=";
hash = "sha256-3gR1vQTs2SCjNtdj/AA69C+2tF23sGxwlVxkkPBUZWU=";
};
strictDeps = true;

View File

@@ -1,7 +1,6 @@
{
autoPatchelfHook,
cairo,
copyDesktopItems,
dbus,
fetchurl,
fontconfig,
@@ -16,7 +15,6 @@
libsForQt5,
libunwind,
libxkbcommon,
makeDesktopItem,
makeWrapper,
openssl,
stdenv,
@@ -24,43 +22,17 @@
zlib,
}:
let
srcs = builtins.fromJSON (builtins.readFile ./srcs.json);
in
stdenv.mkDerivation rec {
pname = "ida-free";
version = "8.4.240320";
version = "9.0sp1";
src = fetchurl {
inherit (srcs.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"))
urls
sha256
;
url = "https://archive.org/download/ida-free-pc_90sp1_x64linux/ida-free-pc_90sp1_x64linux.run";
hash = "sha256-e5uCcJVn6xDwmVm14QCBUvNcB1MpVxNA2WcLyuK23vo=";
};
icon = fetchurl {
urls = [
"https://web.archive.org/web/20221105181231if_/https://hex-rays.com/products/ida/news/8_1/images/icon_free.png"
];
hash = "sha256-widkv2VGh+eOauUK/6Sz/e2auCNFAsc8n9z0fdrSnW0=";
};
desktopItem = makeDesktopItem {
name = "ida-free";
exec = "ida64";
icon = icon;
comment = meta.description;
desktopName = "IDA Free";
genericName = "Interactive Disassembler";
categories = [ "Development" ];
startupWMClass = "IDA";
};
desktopItems = [ desktopItem ];
nativeBuildInputs = [
makeWrapper
copyDesktopItems
autoPatchelfHook
libsForQt5.wrapQtAppsHook
];
@@ -107,23 +79,28 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/bin $out/lib $out/opt
mkdir -p $out/.local/share/applications
# IDA depends on quite some things extracted by the runfile, so first extract everything
# into $out/opt, then remove the unnecessary files and directories.
IDADIR=$out/opt
# The installer doesn't honor `--prefix` in all places,
# thus needing to set `HOME` here.
HOME=$out
# Invoke the installer with the dynamic loader directly, avoiding the need
# to copy it to fix permissions and patch the executable.
$(cat $NIX_CC/nix-support/dynamic-linker) $src \
--mode unattended --prefix $IDADIR --installpassword ""
--mode unattended --prefix $IDADIR
# Copy the exported libraries to the output.
cp $IDADIR/libida64.so $out/lib
cp $IDADIR/libida.so $out/lib
# Some libraries come with the installer.
addAutoPatchelfSearchPath $IDADIR
for bb in ida64 assistant; do
for bb in ida assistant; do
wrapProgram $IDADIR/$bb \
--prefix QT_PLUGIN_PATH : $IDADIR/plugins/platforms
ln -s $IDADIR/$bb $out/bin/$bb
@@ -131,7 +108,10 @@ stdenv.mkDerivation rec {
# runtimeDependencies don't get added to non-executables, and openssl is needed
# for cloud decompilation
patchelf --add-needed libcrypto.so $IDADIR/libida64.so
patchelf --add-needed libcrypto.so $IDADIR/libida.so
mv $out/.local/share $out
rm -r $out/.local
runHook postInstall
'';
@@ -141,7 +121,7 @@ stdenv.mkDerivation rec {
homepage = "https://hex-rays.com/ida-free/";
changelog = "https://hex-rays.com/products/ida/news/";
license = licenses.unfree;
mainProgram = "ida64";
mainProgram = "ida";
maintainers = with maintainers; [ msanft ];
platforms = [ "x86_64-linux" ]; # Right now, the installation script only supports Linux.
sourceProvenance = with sourceTypes; [ binaryNativeCode ];

View File

@@ -1,20 +0,0 @@
{
"x86_64-linux": {
"urls": [
"https://web.archive.org/web/20240330140328/https://out7.hex-rays.com/files/idafree84_linux.run"
],
"sha256": "1wg60afkhjj7my2la4x4qf6gdxzl2aqdbvd6zfnwf8n3bl7ckn2a"
},
"x86_64-darwin": {
"urls": [
"https://web.archive.org/web/20240330140623/https://out7.hex-rays.com/files/idafree84_mac.app.zip"
],
"sha256": "0a97xb0ah6rcq69whs5xvkar43ci8r5nan9wa29ad19w8k25ryym"
},
"aarch64-darwin": {
"urls": [
"https://web.archive.org/web/20240330140634/https://out7.hex-rays.com/files/arm_idafree84_mac.app.zip"
],
"sha256": "10wwq7ia1z1kxfigj4i7xr037bzv1cg3pyvrl27jdq9v7bghdf3m"
}
}

View File

@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "iniparser";
version = "4.2.4";
version = "4.2.5";
src = fetchFromGitLab {
owner = "iniparser";
repo = "iniparser";
rev = "v${finalAttrs.version}";
hash = "sha256-R069LuOmjCFj7dHXiMjuK7WUupk5+dVd8IDKY/wBn2o=";
hash = "sha256-YyIuvkM58WilqggzFcG7BNWSG5t2vHMOUu78PKvdItQ=";
};
patches = lib.optionals finalAttrs.finalPackage.doCheck [

View File

@@ -16,13 +16,13 @@
rustPlatform.buildRustPackage {
pname = "inv-sig-helper";
version = "0-unstable-2025-02-07";
version = "0-unstable-2025-02-15";
src = fetchFromGitHub {
owner = "iv-org";
repo = "inv_sig_helper";
rev = "ac006283c0b6821c856d6293c2ce49b61fa8c46a";
hash = "sha256-cQXWo+idyfFeJ2nnT8HKgjCd0Htc4pOE6aODsl3sf/8=";
rev = "35bc77247b8718ff2705a5f4cbbb3845d02eb65f";
hash = "sha256-WMIKJb85yauEmyfgSl0zNFBfeXya8Ms2MWGNKo6+T1s=";
};
useFetchCargoVendor = true;

View File

@@ -0,0 +1,56 @@
{
lib,
bashInteractive,
coreutils,
fetchFromGitHub,
fzf,
gawk,
gnused,
jujutsu,
makeWrapper,
stdenv,
}:
stdenv.mkDerivation rec {
pname = "jj-fzf";
version = "0.25.0";
src = fetchFromGitHub {
owner = "tim-janik";
repo = "jj-fzf";
tag = "v${version}";
hash = "sha256-StF0TKXTgtglFDbNTAU1c7Vw+6m70Mz2RvFon3difsk=";
};
nativeBuildInputs = [ makeWrapper ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -D jj-fzf $out/bin/jj-fzf
substituteInPlace $out/bin/jj-fzf \
--replace-fail "/usr/bin/env bash" "${lib.getExe bashInteractive}"
wrapProgram $out/bin/jj-fzf \
--prefix PATH : ${
lib.makeBinPath [
bashInteractive
coreutils
fzf
gawk
gnused
jujutsu
]
}
runHook postInstall
'';
meta = with lib; {
description = "Text UI for Jujutsu based on fzf";
homepage = "https://github.com/tim-janik/jj-fzf";
license = licenses.mpl20;
maintainers = with maintainers; [ bbigras ];
platforms = platforms.all;
};
}

View File

@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "k8sgpt";
version = "0.3.48";
version = "0.3.49";
src = fetchFromGitHub {
owner = "k8sgpt-ai";
repo = "k8sgpt";
rev = "v${version}";
hash = "sha256-hnPmFVplLso5O/9Q6zgzqdNId4kAoujLX+IFJ5G2Otg=";
hash = "sha256-Ytn/Ycb0k0odEjp5meTX4pls/vPM+eR7bMzuXHYyJwQ=";
};
vendorHash = "sha256-K9do7u13w2a/9jI7LRtbRvjKJcFU9AnDp2u+ZWSVxw0=";
vendorHash = "sha256-QwLIDUtNMJarwQYWSp739Nfgf7lGmohAXaMga4g93DI=";
# https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
env.CGO_ENABLED = 0;

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.40.3";
version = "0.40.5";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
hash = "sha256-7juy1j2YULP76YIjwzaXRPfbzZ/cIIzH1v5nddl0bKk=";
hash = "sha256-HntKFQnuPJ0i3yd7ItJNROs9decU6lMIxR2ptrc9yRc=";
};
ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
proxyVendor = true;
vendorHash = "sha256-I0gUTyLLOiTm6LiEFHwylYA1I8+/365GxFs8nSARcy0=";
vendorHash = "sha256-O62yKTOW0ZyHyP/PA6cMWHdKjnvaPqm/bXAPtJbhxeY=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);

View File

@@ -7,17 +7,17 @@
rustPlatform.buildRustPackage rec {
pname = "kittycad-kcl-lsp";
version = "0.1.66";
version = "0.1.67";
src = fetchFromGitHub {
owner = "KittyCAD";
repo = "kcl-lsp";
tag = "v${version}";
hash = "sha256-uKsxWNR5syd2+/4I9nxZ+fWBUdHP3rhpUzLVPn4v8Wk=";
hash = "sha256-rqb8I8XJM83jNdaJGiLLp3MKtopRcybgjf9oZ08kdzQ=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-dKNuPg6XRZ6UwZr6+S3+LM3t9xATgGndhX3hrD3Xp0Q=";
cargoHash = "sha256-P8FdmPdeBDYHlG7VuAJkMoiBRSWXKSYQnijTfwby7Io=";
nativeBuildInputs = [ pkg-config ];

View File

@@ -40,13 +40,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.83.1";
version = "1.84.2";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
tag = "v${finalAttrs.version}";
hash = "sha256-mXNPH4Fw1nJaeQpYbelN8y5R5ybyOjIDlV6dEKGgdp0=";
hash = "sha256-7x6p6xI88WmBu+7It5Q54vJyy9Jtejh6Dk6CjpCv5Xo=";
};
enableParallelBuilding = true;

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kopia";
version = "0.18.2";
version = "0.19.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-7gQlBLmHvqsXXmSYllfsDJRx9VjW0AH7bXf6cG6lGOI=";
owner = "kopia";
repo = "kopia";
tag = "v${version}";
hash = "sha256-PfxMs9MwoI+4z8vZ1sVlIEal3TOmA06997jWwShNfrE=";
};
vendorHash = "sha256-lCUEL7rtnv8/86ZTHM4HsYplDnWj1xsFh83JKW6qRrk=";
vendorHash = "sha256-E9wF3mBm6pLHKVMMz3gvcXzb1wQkosecrmEk8c+2gcU=";
subPackages = [ "." ];

View File

@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "kuttl";
version = "0.21.0";
version = "0.22.0";
cli = "kubectl-kuttl";
src = fetchFromGitHub {
owner = "kudobuilder";
repo = "kuttl";
rev = "v${version}";
sha256 = "sha256-0eETF9kf5e0E7R9CEANZC854r7/P/wjxeVgx90TdRFg=";
sha256 = "sha256-M9sZNrze7v1dj0j+hOo30kB87YKxFF/hZJ7R2C/Pzwg=";
};
vendorHash = "sha256-QYdeYmp++sAvgDPWpEscfm4n0lRejLTPZPGbVPCoWmk=";
vendorHash = "sha256-WhgmseJVfhvVHARI2XaMkRE/sIfpeJj0JzYiAgza6jQ=";
subPackages = [ "cmd/kubectl-kuttl" ];

View File

@@ -8,11 +8,11 @@
let
pname = "ledger-live-desktop";
version = "2.98.0";
version = "2.100.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-wYSs7PIj5eA5C/5msbZb+OkcC3Hrhi57yyYrKZ0mvCM=";
hash = "sha256-WDSlVcWOwri8CT4AD9/tahx5upJvKCQp45wltPp8zI8=";
};
appimageContents = appimageTools.extractType2 {

View File

@@ -0,0 +1,42 @@
{
lib,
gitUpdater,
fetchFromGitHub,
python3Packages,
}:
let
version = "0.20.36";
in
python3Packages.buildPythonApplication {
pname = "legendary-heroic";
inherit version;
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "legendary";
rev = version;
sha256 = "sha256-+aywgd5RZfkmVuA0MaF2/Ie4a5If/zQxvVCcTfGpQpE=";
};
propagatedBuildInputs = with python3Packages; [
requests
filelock
];
disabled = python3Packages.pythonOlder "3.8";
pythonImportsCheck = [ "legendary" ];
meta = with lib; {
description = "Free and open-source Epic Games Launcher alternative";
longDescription = ''
This is the Heroic Games Launcher's fork of legendary.
'';
homepage = "https://github.com/Heroic-Games-Launcher/legendary";
license = licenses.gpl3;
maintainers = with maintainers; [ aidalgol ];
mainProgram = "legendary";
};
passthru.updateScript = gitUpdater { };
}

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lego";
version = "4.19.2";
version = "4.22.2";
src = fetchFromGitHub {
owner = "go-acme";
repo = pname;
rev = "v${version}";
hash = "sha256-O4lzOZUiicmahxcbzPsEU2+tPDTCUun2JLeWZjpTZIQ=";
repo = "lego";
tag = "v${version}";
hash = "sha256-tvvTaRPOmNX0D8QvgA+8u5XsMxnT9PK4PMBcL6RHSIE=";
};
vendorHash = "sha256-BcE/8pxQdJp9vttLo4wDSUswJnaBhIn/mlt3ZcOf2wA=";
vendorHash = "sha256-T6ZeQKrdz16zwppkFei21JjwGsoPLHazHTZew822xdU=";
doCheck = false;

View File

@@ -5,8 +5,12 @@
jdk_headless,
jre_minimal,
maven,
writeScript,
lemminx,
writeShellApplication,
curl,
pcre,
common-updater-scripts,
jq,
gnused,
}:
let
@@ -21,13 +25,13 @@ let
in
maven.buildMavenPackage rec {
pname = "lemminx";
version = "0.27.0";
version = "0.29.0";
src = fetchFromGitHub {
owner = "eclipse";
repo = "lemminx";
rev = version;
hash = "sha256-VWYTkYlPziNRyxHdvIWVuDlABpKdzhC/F6BUBj/opks=";
hash = "sha256-joeaN0Q/XxEWa7UX/LVSWIAb8GGTfVUE+NudedbBLBI=";
# Lemminx reads this git information at runtime from a git.properties
# file on the classpath
leaveDotGit = true;
@@ -42,21 +46,11 @@ maven.buildMavenPackage rec {
'';
};
manualMvnArtifacts = [
"org.apache.maven.surefire:surefire-junit-platform:3.1.2"
"org.junit.platform:junit-platform-launcher:1.10.0"
];
mvnJdk = jdk_headless;
mvnHash = "sha256-jIvYUATcNUZZmZcXbUMqyHGX4CYiXqL0jkji+zrCYJY=";
mvnHash = "sha256-7RLZSlmXnjl9vwvCf/Z+mc2906JtuUbjjkRGVMC1En8=";
buildOffline = true;
# disable gitcommitid plugin which needs a .git folder which we
# don't have
mvnDepsParameters = "-Dmaven.gitcommitid.skip=true";
# disable failing tests which either need internet access or are flaky
# Disable gitcommitid plugin which needs a .git folder which we don't have.
# Disable failing tests which either need internet access or are flaky.
mvnParameters = lib.escapeShellArgs [
"-Dmaven.gitcommitid.skip=true"
"-Dtest=!XMLValidationCommandTest,
@@ -70,15 +64,16 @@ maven.buildMavenPackage rec {
!MissingChildElementCodeActionTest,
!XSDValidationExternalResourcesTest,
!DocumentLifecycleParticipantTest,
!DTDValidationExternalResourcesTest"
!DTDValidationExternalResourcesTest,
!DTDHoverExtensionsTest,
!CacheResourcesManagerTest"
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share
install -Dm644 org.eclipse.lemminx/target/org.eclipse.lemminx-uber.jar \
$out/share
install -Dm644 org.eclipse.lemminx/target/org.eclipse.lemminx-uber.jar $out/share
makeWrapper ${jre}/bin/java $out/bin/lemminx \
--add-flags "-jar $out/share/org.eclipse.lemminx-uber.jar"
@@ -88,26 +83,44 @@ maven.buildMavenPackage rec {
nativeBuildInputs = [ makeWrapper ];
passthru.updateScript = writeScript "update-lemminx" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl pcre common-updater-scripts jq gnused
set -eu -o pipefail
passthru = {
updateScript =
let
pkgFile = builtins.toString ./package.nix;
in
lib.getExe (writeShellApplication {
name = "update-${pname}";
runtimeInputs = [
curl
pcre
common-updater-scripts
jq
gnused
];
text = ''
if [ -z "''${GITHUB_TOKEN:-}" ]; then
echo "no GITHUB_TOKEN provided - you could meet API request limiting" >&2
fi
LATEST_TAG=$(curl https://api.github.com/repos/eclipse/lemminx/tags | \
jq -r '[.[] | select(.name | test("^[0-9]"))] | sort_by(.name | split(".") |
map(tonumber)) | reverse | .[0].name')
update-source-version lemminx "$LATEST_TAG"
sed -i '0,/mvnHash *= *"[^"]*"/{s/mvnHash = "[^"]*"/mvnHash = ""/}' ${lemminx}
LATEST_TAG=$(curl -H "Accept: application/vnd.github+json" \
''${GITHUB_TOKEN:+-H "Authorization: bearer $GITHUB_TOKEN"} \
-Lsf https://api.github.com/repos/${src.owner}/${src.repo}/tags | \
jq -r '[.[] | select(.name | test("^[0-9]"))] | sort_by(.name | split(".") |
map(tonumber)) | reverse | .[0].name')
update-source-version ${pname} "$LATEST_TAG"
sed -i '0,/mvnHash *= *"[^"]*"/{s/mvnHash = "[^"]*"/mvnHash = ""/}' ${pkgFile}
echo -e "\nFetching all mvn dependencies to calculate the mvnHash. This may take a while ..."
nix-build -A lemminx.fetchedMavenDeps 2> lemminx-stderr.log || true
echo -e "\nFetching all mvn dependencies to calculate the mvnHash. This may take a while ..."
nix-build -A ${pname}.fetchedMavenDeps 2> ${pname}-stderr.log || true
NEW_MVN_HASH=$(cat lemminx-stderr.log | grep "got:" | awk '{print ''$2}')
rm lemminx-stderr.log
# escaping double quotes looks ugly but is needed for variable substitution
# use # instead of / as separator because the sha256 might contain the / character
sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${lemminx}
'';
NEW_MVN_HASH=$(grep "got:" ${pname}-stderr.log | awk '{print ''$2}')
rm ${pname}-stderr.log
# escaping double quotes looks ugly but is needed for variable substitution
# use # instead of / as separator because the sha256 might contain the / character
sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${pkgFile}
'';
});
};
meta = with lib; {
description = "XML Language Server";

View File

@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libblake3";
version = "1.5.5";
version = "1.6.0";
src = fetchFromGitHub {
owner = "BLAKE3-team";
repo = "BLAKE3";
tag = finalAttrs.version;
hash = "sha256-2M8OQNmtWwfDcbZYspaxpGz2clpfILru//4+P6dClNw=";
hash = "sha256-Ijen3IacwohI2tKxTWv0JWgRfiCQS/SDtkkqEUWiOzk=";
};
sourceRoot = finalAttrs.src.name + "/c";
@@ -22,6 +22,10 @@ stdenv.mkDerivation (finalAttrs: {
cmake
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
];
meta = {
description = "Official C implementation of BLAKE3";
homepage = "https://github.com/BLAKE3-team/BLAKE3/tree/master/c";

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
libusb-compat-0_1,
readline,
cmake,
autoreconfHook,
pkg-config,
}:
@@ -20,24 +20,31 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
cmake
# Note: Use autotools instead of cmake to build for darwin.
# When built with cmake, the following error occurs on real device like PN532:
# ```
# $ LIBNFC_DEVICE=pn532_uart:/dev/tty.usbserial-110 nfc-list
# nfc-list uses libnfc 1.8.0
# error libnfc.bus.uart Unable to set serial port speed to 115200 baud. Speed value must be one of those defined in termios(3).
# error libnfc.driver.pn532_uart pn53x_check_communication error
# nfc-list: ERROR: Unable to open NFC device: pn532_uart:/dev/tty.usbserial-110
# ```
autoreconfHook
pkg-config
];
buildInputs = [
libusb-compat-0_1
readline
];
propagatedBuildInputs = [
libusb-compat-0_1
];
configureFlags = [
"sysconfdir=/etc"
];
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
"-DLIBNFC_DRIVER_PN532_I2C=OFF"
"-DLIBNFC_DRIVER_PN532_SPI=OFF"
];
meta = with lib; {
description = "Library for Near Field Communication (NFC)";
homepage = "https://github.com/nfc-tools/libnfc";

View File

@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "librecad";
version = "2.2.1";
version = "2.2.1.1";
src = fetchFromGitHub {
owner = "LibreCAD";
repo = "LibreCAD";
tag = "v${finalAttrs.version}";
hash = "sha256-GBn4lduzaKWEWzeTNjC9TpioSouVj+jVl32PLjc8FBc=";
hash = "sha256-0RhdX8wUjZ2JQazhFjkfdnxvh5VhXfVMspvhBF03VNk=";
};
buildInputs = [

File diff suppressed because it is too large Load Diff

View File

@@ -22,14 +22,14 @@ rustPlatform.buildRustPackage rec {
pname = "libsignal-ffi";
# must match the version used in mautrix-signal
# see https://github.com/mautrix/signal/issues/401
version = "0.64.1";
version = "0.66.2";
src = fetchFromGitHub {
fetchSubmodules = true;
owner = "signalapp";
repo = "libsignal";
rev = "v${version}";
hash = "sha256-36z8Tgf3w0ZDLOS7hMTeVbZLiq/M/es6+sL8rEWtps4=";
tag = "v${version}";
hash = "sha256-V7w+77X1a2Uga/RUCqppY3THbAktaPN+DLrze4UwfHM=";
};
buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
@@ -40,17 +40,10 @@ rustPlatform.buildRustPackage rec {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
env.BORING_BSSL_PATH = "${boringssl-wrapper}";
env.NIX_LDFLAGS = "-lstdc++";
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
# The Cargo.lock contains git dependencies
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"boring-4.13.0" = "sha256-+0LeCN4YtHe84GzkMZog8gCTvrzVNoAYXv04jQXZaUo=";
"intmap-2.0.0" = "sha256-PGlkaZl+DYS4QkpJFfUf+2unVKwd9vLNF0N+/YFg8qE=";
"curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-a3Xb37gFs7GWk8/9cFdaC9tsYCv/MQGJ78r5YCQ0DOo=";
cargoBuildFlags = [
"-p"

View File

@@ -11,17 +11,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "licensure";
version = "0.6.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "chasinglogic";
repo = "licensure";
rev = version;
hash = "sha256-YPdVVHJ/ldILGbg95x7D06chG8Q6a+NnTAimuvBScpE=";
hash = "sha256-Zd3Jidw3bC/B9vE3zdxDl3UyQNbtwiVBB2VRzBtt7d8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-+lZ70D62je+vCExN77LQqNiIqJFUO8FUjyOZbdfbM/c=";
cargoHash = "sha256-Rua/o1klNDHdCaRqs1HqyFAq1Gq1XssBhuipVNxwrP4=";
nativeBuildInputs = [ pkg-config ];
buildInputs =
[

View File

@@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec {
pname = "mandown";
version = "0.1.5";
version = "1.0.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-TgOxRd8s2Vb4pNVPmFt2E5VnRHIEt6YlnTNyr91l6P8=";
hash = "sha256-30AM/t1Qq4xydG12Nh+J1MBKNvxxD/LVTkmTchsZHLw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-a2RfwS45B2PrId4kxIx1Ko+tjED4ZU+WziOxa79q2/E=";
cargoHash = "sha256-T3cUHyKQIYTL9jMoLsq6jEiIeFZcSZuyCna7TNEjGyU=";
meta = with lib; {
description = "Markdown to groff (man page) converter";

View File

@@ -1,21 +1,32 @@
{ stdenv
, fetchurl
, sane-backends
, nss
, autoPatchelfHook
, lib
, libsForQt5
, pkcs11helper
{
stdenv,
fetchurl,
sane-backends,
nss,
autoPatchelfHook,
lib,
libsForQt5,
pkcs11helper,
}:
stdenv.mkDerivation rec {
pname = "masterpdfeditor";
version = "5.9.82";
version = "5.9.86";
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
hash = "sha256-CbrhhQJ0iiXz8hUJEi+/xb2ZGbunuPuIIgmCRgJhNVU=";
};
src =
let
selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
in
fetchurl {
url = selectSystem {
x86_64-linux = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64-qt_include.tar.gz";
aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.arm64.tar.gz";
};
hash = selectSystem {
x86_64-linux = "sha256-QBwcsEz13+EdgkKJRdmdsb6f3dt3N6WR/EEACdWbYNo=";
aarch64-linux = "sha256-OTn5Z82fRMLQwVSLwoGAaj9c9SfEicyl8e1A1ICOUf0=";
};
};
nativeBuildInputs = [
autoPatchelfHook
@@ -54,13 +65,16 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = with lib; {
meta = {
description = "Master PDF Editor";
homepage = "https://code-industry.net/free-pdf-editor/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ cmcdragonkai ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfreeRedistributable;
platforms = [
"x86_64-linux"
"aarch64-linux"
];
maintainers = with lib.maintainers; [ cmcdragonkai ];
mainProgram = "masterpdfeditor5";
};
}

View File

@@ -6,14 +6,14 @@
python3.pkgs.buildPythonPackage rec {
pname = "md-tangle";
version = "1.3.1";
version = "1.4.4";
# By some strange reason, fetchPypi fails miserably
src = fetchFromGitHub {
owner = "joakimmj";
repo = pname;
rev = "v${version}";
hash = "sha256-cUME2AHK/Fva+1TSTE6hNu0SE/V1FOwcSxWF0+iZhS4=";
tag = "v${version}";
hash = "sha256-PkOKSsyY8uwS4mhl0lB+KGeUvXfEc7PUDHZapHMYv4c=";
};
# Pure Python application, uses only standard modules and comes without

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