Merge 454f2ab1e1 into haskell-updates
This commit is contained in:
@@ -117,7 +117,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this is a bug and not a support request."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+-label%3A%226.topic%3A+darwin%22+-label%3A%226.topic%3A+nixos%22). "
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+bug%22+-label%3A%226.topic%3A+darwin%22+-label%3A%226.topic%3A+nixos%22). "
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -131,7 +131,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this is a bug and not a support request."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+darwin%22). "
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+darwin%22). "
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -121,7 +121,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this is a bug and not a support request."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+nixos%22). "
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+nixos%22). "
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -127,7 +127,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this is a bug and not a support request."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+build+failure%22). "
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%220.kind%3A+build+failure%22)."
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -100,7 +100,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this package update does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28update%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+package+%28update%29%22)."
|
||||
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+package+%28update%29%22)."
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -75,7 +75,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this module does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+module+%28new%29%22) or in [NixOS Unstable](https://search.nixos.org/options?channel=unstable)."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+module+%28new%29%22). "
|
||||
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+module+%28new%29%22). "
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -81,7 +81,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this backport does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+in%3Atitle+backport)."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+port+to+stable%22+)."
|
||||
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+port+to+stable%22+)."
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -63,7 +63,7 @@ body:
|
||||
options:
|
||||
- label: "I assert that this request is not already implemented in the latest [NixOS](https://nixos.org/manual/nixos/unstable/) or [Nixpkgs](https://nixos.org/manual/nixpkgs/unstable/) manuals."
|
||||
required: true
|
||||
- label: "I assert that this is not a [duplicate of an existing documentation issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22)."
|
||||
- label: "I assert that this is not a [duplicate of an existing documentation issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%229.needs%3A+documentation%22)."
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -133,7 +133,7 @@ body:
|
||||
attributes:
|
||||
label: "I assert that this issue is relevant for Nixpkgs"
|
||||
options:
|
||||
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%226.topic%3A+reproducible+builds%22)."
|
||||
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+label%3A%226.topic%3A+reproducible+builds%22)."
|
||||
required: true
|
||||
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
|
||||
required: true
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
adding `pkg-config`, `xfce4-dev-tools`, and `wrapGAppsHook3` to your `nativeBuildInputs` and
|
||||
`--enable-maintainer-mode` to your `configureFlags`.
|
||||
|
||||
- `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0).
|
||||
|
||||
- `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js.
|
||||
|
||||
- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.
|
||||
@@ -87,6 +89,8 @@
|
||||
If your SQLite database is corrupted, the migration might fail and require [manual intervention](https://github.com/louislam/uptime-kuma/issues/5281).
|
||||
See the [migration guide](https://github.com/louislam/uptime-kuma/wiki/Migration-From-v1-To-v2) for more information.
|
||||
|
||||
- Switch inhibitors were introduced, which add a pre-switch check that compares a list of strings between the previous and the new generation, and refuses to switch into the new generation when there is a difference between the two lists. This allows to avoid switching into a system when for instance the systemd version changed by adding `config.systemd.package.version` to the switch inhibitors for your system. You can still forcefully switch into any generation by setting `NIXOS_NO_CHECK=1`.
|
||||
|
||||
- The `services.nextcloud-spreed-signaling` NixOS module has been added to facilitate declarative management of a standalone Spreed signaling server ("High Performance Backend" for Nextcloud Talk).
|
||||
|
||||
- `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.
|
||||
|
||||
@@ -140,6 +140,12 @@
|
||||
github = "0xd61";
|
||||
githubId = 8351869;
|
||||
};
|
||||
_0xMillyByte = {
|
||||
email = "emilia.daelman@gmail.com";
|
||||
name = "Emilia Daelman";
|
||||
github = "0xMillyByte";
|
||||
githubId = 48217459;
|
||||
};
|
||||
_0xMRTT = {
|
||||
email = "0xMRTT@proton.me";
|
||||
name = "0xMRTT";
|
||||
@@ -16660,6 +16666,12 @@
|
||||
githubId = 396449;
|
||||
name = "Brandon Edens";
|
||||
};
|
||||
mbinns = {
|
||||
email = "mack@yourdata.rip";
|
||||
github = "mbinns";
|
||||
githubId = 14008591;
|
||||
name = "Mack Binns";
|
||||
};
|
||||
mbode = {
|
||||
email = "maxbode@gmail.com";
|
||||
github = "mbode";
|
||||
@@ -19611,6 +19623,12 @@
|
||||
githubId = 14004859;
|
||||
name = "Ole Mussmann";
|
||||
};
|
||||
olillin = {
|
||||
email = "oli@olillin.com";
|
||||
github = "olillin";
|
||||
githubId = 55047947;
|
||||
name = "Oli";
|
||||
};
|
||||
oliver-koss = {
|
||||
email = "oliver.koss06@gmail.com";
|
||||
github = "oliver-koss";
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.programs.mangowc;
|
||||
in
|
||||
{
|
||||
options.programs.mangowc = {
|
||||
enable = lib.mkEnableOption "MangoWC, a Wayland compositor based on dwl and scenefx";
|
||||
|
||||
package = lib.mkPackageOption pkgs "mangowc" {
|
||||
default = [ "mangowc" ];
|
||||
example = "pkgs.mangowc.override { enableXWayland = false; }";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# Necessary Wayland plumbing
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-wlr
|
||||
xdg-desktop-portal-gtk
|
||||
];
|
||||
|
||||
config.mango = {
|
||||
default = [
|
||||
"gtk"
|
||||
];
|
||||
|
||||
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
"org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ];
|
||||
"org.freedesktop.impl.portal.ScreenShot" = [ "wlr" ];
|
||||
|
||||
# wlr does not have this interface, let gtk handle
|
||||
"org.freedesktop.impl.portal.Inhibit" = [ "gtk" ];
|
||||
};
|
||||
};
|
||||
|
||||
# Set up the session for Display Managers (GDM, SDDM, etc.)
|
||||
services.displayManager.sessionPackages = [ cfg.package ];
|
||||
};
|
||||
}
|
||||
@@ -11,10 +11,19 @@ let
|
||||
in
|
||||
{
|
||||
options.services.llama-swap = {
|
||||
enable = lib.mkEnableOption "enable the llama-swap service";
|
||||
enable = lib.mkEnableOption "the llama-swap service";
|
||||
|
||||
package = lib.mkPackageOption pkgs "llama-swap" { };
|
||||
|
||||
listenAddress = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "localhost";
|
||||
example = "0.0.0.0";
|
||||
description = ''
|
||||
Address that llama-swap listens on.
|
||||
'';
|
||||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
default = 8080;
|
||||
example = 11343;
|
||||
@@ -33,6 +42,30 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
tls = {
|
||||
enable = lib.mkEnableOption "TLS encryption";
|
||||
|
||||
certFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/path/to/cert.pem";
|
||||
description = ''
|
||||
Path to the TLS certificate file. This certificate will be offered to,
|
||||
and may be verified by, clients.
|
||||
'';
|
||||
};
|
||||
|
||||
keyFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/path/to/key.pem";
|
||||
description = ''
|
||||
Path to the TLS private key file. This key will be used to decrypt,
|
||||
data received from clients.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule { freeformType = settingsFormat.type; };
|
||||
description = ''
|
||||
@@ -64,6 +97,17 @@ in
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.tls.enable -> cfg.tls.certFile != null;
|
||||
message = "Please provide a certificate to use for TLS encryption.";
|
||||
}
|
||||
{
|
||||
assertion = cfg.tls.enable -> cfg.tls.keyFile != null;
|
||||
message = "Please provide a private key to use for TLS encryption.";
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.llama-swap = {
|
||||
description = "Model swapping for LLaMA C++ Server (or any local OpenAPI compatible server)";
|
||||
after = [ "network.target" ];
|
||||
@@ -71,7 +115,18 @@ in
|
||||
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
ExecStart = "${lib.getExe cfg.package} --listen :${toString cfg.port} --config ${configFile}";
|
||||
ExecStart = "${lib.getExe cfg.package} ${
|
||||
lib.escapeShellArgs (
|
||||
[
|
||||
"--listen=${cfg.listenAddress}:${toString cfg.port}"
|
||||
"--config=${configFile}"
|
||||
]
|
||||
++ lib.optionals cfg.tls.enable [
|
||||
"--tls-cert-file=${cfg.tls.certFile}"
|
||||
"--tls-key-file=${cfg.tls.keyFile}"
|
||||
]
|
||||
)
|
||||
}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 3;
|
||||
|
||||
@@ -112,6 +167,7 @@ in
|
||||
ProtectProc = "invisible";
|
||||
ProtectHostname = true;
|
||||
ProcSubset = "pid";
|
||||
WorkingDirectory = "/tmp";
|
||||
};
|
||||
};
|
||||
networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
|
||||
|
||||
@@ -371,7 +371,8 @@ in
|
||||
AmbientCapabilities = [
|
||||
# Needed to be able to manipulate the rulesets
|
||||
"CAP_NET_ADMIN"
|
||||
];
|
||||
]
|
||||
++ lib.optional ((cfg.settings.mode == "iptables") || (cfg.settings.mode == "ipset")) "CAP_NET_RAW";
|
||||
CapabilityBoundingSet = AmbientCapabilities;
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
|
||||
@@ -174,10 +174,6 @@ in
|
||||
permissions = "u+rx,g+rx,o-rx";
|
||||
};
|
||||
|
||||
system.switch.inhibitors = [
|
||||
cfg.dbusPackage
|
||||
];
|
||||
|
||||
systemd.services.dbus = {
|
||||
aliases = [
|
||||
# hack aiding to prevent dbus from restarting when switching from dbus-broker back to dbus
|
||||
@@ -216,10 +212,6 @@ in
|
||||
cfg.brokerPackage
|
||||
];
|
||||
|
||||
system.switch.inhibitors = [
|
||||
cfg.brokerPackage
|
||||
];
|
||||
|
||||
# Just to be sure we don't restart through the unit alias
|
||||
systemd.services.dbus.reloadIfChanged = true;
|
||||
systemd.user.services.dbus.reloadIfChanged = true;
|
||||
|
||||
@@ -1281,7 +1281,7 @@ let
|
||||
(assertValueOneOf "EmitRouter" boolValues)
|
||||
(assertValueOneOf "EmitTimezone" boolValues)
|
||||
(assertValueOneOf "BindToInterface" boolValues)
|
||||
(assertValueOneOf "PersistLeases" boolValues)
|
||||
(assertValueOneOf "PersistLeases" (boolValues ++ [ "runtime" ]))
|
||||
];
|
||||
|
||||
sectionIPv6SendRA = checkUnitConfig "IPv6SendRA" [
|
||||
|
||||
@@ -567,10 +567,6 @@ in
|
||||
);
|
||||
};
|
||||
|
||||
system.switch.inhibitors = [
|
||||
cfg.package
|
||||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc =
|
||||
|
||||
@@ -18,6 +18,11 @@ in
|
||||
|
||||
system.fsPackages = [ pkgs.xfsprogs.bin ];
|
||||
|
||||
systemd = {
|
||||
packages = [ pkgs.xfsprogs.out ];
|
||||
services.xfs_scrub_all.path = [ pkgs.util-linux.bin ]; # lsblk
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules = mkIf inInitrd [
|
||||
"xfs"
|
||||
"crc32c"
|
||||
|
||||
@@ -30,9 +30,10 @@
|
||||
builderKeys ? [
|
||||
"152812300785C96444D3334D17565732E08E5E41" # achow101.gpg
|
||||
"9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg
|
||||
"71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg
|
||||
"6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg
|
||||
# "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg (not signed 30.1)
|
||||
"D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg
|
||||
"71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg
|
||||
"67AA5B46E7AF78053167FE343B8F814A784218F8" # willcl-ark.gpg
|
||||
],
|
||||
}:
|
||||
|
||||
@@ -45,14 +46,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
version = "30.0";
|
||||
version = "30.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz"
|
||||
];
|
||||
# hash retrieved from signed SHA256SUMS
|
||||
sha256 = "9b472a4d51dfed9aa9d0ded2cb8c7bcb9267f8439a23a98f36eb509c1a5e6974";
|
||||
sha256 = "5d5518782c3000f64717ec1b4291e7e609a1f900d9729ee83c982243779c3f43";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -86,18 +87,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
publicKeys = fetchFromGitHub {
|
||||
owner = "bitcoin-core";
|
||||
repo = "guix.sigs";
|
||||
rev = "a788388207bd244d5ab07b31ecd6c126f213a6c6";
|
||||
sha256 = "sha256-gbenuEWP6pqY9ywPd/yZy6QfWI7jvSObwto27DRXjGI=";
|
||||
rev = "8427342623f66a98e4b2503e5e15eb41485200d2";
|
||||
sha256 = "sha256-X1mA1iPAb0OE9RNP9O5rFe9rzsui+BWQ2zMcV7SghXE=";
|
||||
};
|
||||
|
||||
checksums = fetchurl {
|
||||
url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";
|
||||
hash = "sha256-v/b1wTOreKifpWkIrUEJsGaSo7LFs4pn7YgBN88dO9o=";
|
||||
hash = "sha256-WdOYSEbxmpecFpThNwxKTNXbbwQvqlUuCxmCbhfhW6k";
|
||||
};
|
||||
|
||||
signatures = fetchurl {
|
||||
url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";
|
||||
hash = "sha256-MK37HyHAqp/vWLjKm/3HF0LkTXtKQwqz6cL4hY2YUPU=";
|
||||
hash = "sha256-yFPhf/tyotBtpx1lZAQR+C2YdZaAyaWCq/0OVdP2wR4=";
|
||||
};
|
||||
|
||||
verifyBuilderKeys =
|
||||
|
||||
@@ -3,24 +3,23 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
cmake,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
util-linux,
|
||||
hexdump,
|
||||
autoSignDarwinBinariesHook,
|
||||
wrapQtAppsHook ? null,
|
||||
boost,
|
||||
libevent,
|
||||
miniupnpc,
|
||||
zeromq,
|
||||
zlib,
|
||||
db53,
|
||||
sqlite,
|
||||
qrencode,
|
||||
libsystemtap,
|
||||
qtbase ? null,
|
||||
qttools ? null,
|
||||
python3,
|
||||
versionCheckHook,
|
||||
withGui ? false,
|
||||
withWallet ? true,
|
||||
}:
|
||||
@@ -32,24 +31,22 @@ let
|
||||
sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = if withGui then "groestlcoin" else "groestlcoind";
|
||||
version = "28.0";
|
||||
version = "29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Groestlcoin";
|
||||
repo = "groestlcoin";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "17b83jch717d91srw1yc93p8ndl894ld9gx916wyy6jis07px6xh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
cmake
|
||||
pkg-config
|
||||
installShellFiles
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
]
|
||||
@@ -58,10 +55,10 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
boost
|
||||
libevent
|
||||
miniupnpc
|
||||
zeromq
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux) [ libsystemtap ]
|
||||
++ lib.optionals withWallet [
|
||||
db53
|
||||
sqlite
|
||||
@@ -73,9 +70,10 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash contrib/completions/bash/groestlcoin-cli.bash
|
||||
installShellCompletion --bash contrib/completions/bash/groestlcoind.bash
|
||||
installShellCompletion --bash contrib/completions/bash/groestlcoin-tx.bash
|
||||
cd ..
|
||||
installShellCompletion --bash contrib/completions/bash/groestlcoin-cli.bash
|
||||
installShellCompletion --bash contrib/completions/bash/groestlcoind.bash
|
||||
installShellCompletion --bash contrib/completions/bash/groestlcoin-tx.bash
|
||||
|
||||
for file in contrib/completions/fish/groestlcoin-*.fish; do
|
||||
installShellCompletion --fish $file
|
||||
@@ -89,16 +87,16 @@ stdenv.mkDerivation rec {
|
||||
install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
]
|
||||
++ lib.optionals (!withWallet) [
|
||||
"--disable-wallet"
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_BENCH" false)
|
||||
(lib.cmakeBool "WITH_ZMQ" true)
|
||||
(lib.cmakeBool "WITH_USDT" (stdenv.hostPlatform.isLinux))
|
||||
(lib.cmakeBool "ENABLE_WALLET" (!withWallet))
|
||||
(lib.cmakeBool "BUILD_GUI" (!withGui))
|
||||
(lib.cmakeBool "ENABLE_WALLET" false)
|
||||
]
|
||||
++ lib.optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
(lib.cmakeBool "BUILD_GUI" true)
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
@@ -112,6 +110,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/groestlcoin-cli";
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Peer-to-peer electronic cash system";
|
||||
longDescription = ''
|
||||
@@ -121,9 +128,10 @@ stdenv.mkDerivation rec {
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
'';
|
||||
homepage = "https://groestlcoin.org/";
|
||||
downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v${version}/";
|
||||
downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v${finalAttrs.version}/";
|
||||
changelog = "https://github.com/Groestlcoin/groestlcoin/blob/${finalAttrs.version}.0/doc/release-notes/release-notes-${finalAttrs.version}.0.md";
|
||||
maintainers = with lib.maintainers; [ gruve-p ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -168,7 +168,8 @@ stdenv.mkDerivation {
|
||||
++ lib.optional wrapPythonDrv makeWrapper
|
||||
++ lib.optional nlsSupport gettext
|
||||
++ lib.optional perlSupport perl
|
||||
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3;
|
||||
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3
|
||||
++ lib.optional waylandSupport wayland-scanner;
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
@@ -188,7 +189,6 @@ stdenv.mkDerivation {
|
||||
]
|
||||
++ lib.optional (guiSupport == "gtk2") gtk2-x11
|
||||
++ lib.optional (guiSupport == "gtk3") gtk3-x11
|
||||
++ lib.optional waylandSupport wayland-scanner
|
||||
++ lib.optional luaSupport lua
|
||||
++ lib.optional pythonSupport python3
|
||||
++ lib.optional tclSupport tcl
|
||||
|
||||
@@ -12050,6 +12050,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-treesitter-locals = buildVimPlugin {
|
||||
pname = "nvim-treesitter-locals";
|
||||
version = "0-unstable-2025-11-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter-locals";
|
||||
rev = "76d9ea45e860fb42b92ac4926ea869239fc638d0";
|
||||
hash = "sha256-FLZ6h1M3Kc/YjOfKhn8nKLyVTySMMpsOL2MzIoAMEes=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-locals/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-treesitter-pairs = buildVimPlugin {
|
||||
pname = "nvim-treesitter-pairs";
|
||||
version = "0-unstable-2023-07-23";
|
||||
@@ -15245,6 +15258,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-hierarchy-nvim = buildVimPlugin {
|
||||
pname = "telescope-hierarchy.nvim";
|
||||
version = "0-unstable-2025-12-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmacadie";
|
||||
repo = "telescope-hierarchy.nvim";
|
||||
rev = "85fb67112daf99f3918531558ee85a36c1891f91";
|
||||
hash = "sha256-Ck7xM+m8sRkkviXdXpeDYrxr3MNpavkW4/UCih0Ohc8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jmacadie/telescope-hierarchy.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-live-grep-args-nvim = buildVimPlugin {
|
||||
pname = "telescope-live-grep-args.nvim";
|
||||
version = "1.1.0-unstable-2025-02-24";
|
||||
|
||||
@@ -3487,6 +3487,13 @@ assertNoAdditions {
|
||||
dependencies = [ self.telescope-nvim ];
|
||||
};
|
||||
|
||||
telescope-hierarchy-nvim = super.telescope-hierarchy-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
telescope-nvim
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
telescope-live-grep-args-nvim = super.telescope-live-grep-args-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
|
||||
@@ -925,6 +925,7 @@ https://github.com/nvim-tree/nvim-tree.lua/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter-context/,,
|
||||
https://github.com/RRethy/nvim-treesitter-endwise/,HEAD,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter-locals/,HEAD,
|
||||
https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD,
|
||||
https://github.com/eddiebergman/nvim-treesitter-pyfold/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
|
||||
@@ -1170,6 +1171,7 @@ https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
|
||||
https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-github.nvim/,,
|
||||
https://github.com/alduraibi/telescope-glyph.nvim/,HEAD,
|
||||
https://github.com/jmacadie/telescope-hierarchy.nvim/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD,
|
||||
https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
|
||||
|
||||
@@ -1997,8 +1997,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "Go";
|
||||
publisher = "golang";
|
||||
version = "0.50.0";
|
||||
hash = "sha256-e0O5EXStxHw7sKozH6qzLSMzy00S+6Q7p9KtP+NbB6Y=";
|
||||
version = "0.52.1";
|
||||
hash = "sha256-y3IaNkdyWnZCwQ9Zgryn6D2cUT+eyJ4/yXgGSTRGpWw=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "pcsx-rearmed";
|
||||
version = "0-unstable-2025-12-28";
|
||||
version = "0-unstable-2026-01-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "pcsx_rearmed";
|
||||
rev = "a2640fe1a0e21729054cdb74db8a21e4bf6dde17";
|
||||
hash = "sha256-HzgpqgTcFT0Dz0SIn4zW4oF4FxOTYzgg1/sFi3XDwQ4=";
|
||||
rev = "32e2193bcc9d937d9b1a16db43258aef51cddae8";
|
||||
hash = "sha256-enq5RqeTiOLGqi+Hsj3wFZ6EUWSl0gX7u4ymznOffsQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "stella";
|
||||
version = "0-unstable-2025-12-28";
|
||||
version = "0-unstable-2026-01-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stella-emu";
|
||||
repo = "stella";
|
||||
rev = "7f62c3e1390f629cbd56cbb5172f7e2143b30440";
|
||||
hash = "sha256-IMrqBu7beSuJNfl2pyzRm5yExXaMkl+si0YVDeRbAcU=";
|
||||
rev = "6efad98f0058e803ac675ead6dbe33c054db1492";
|
||||
hash = "sha256-iwGDxd+xrxGgLZF9896OaYMMCo573l9lbnSZgNstHOQ=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
From fc4baf7cbb71ba7a47b174870dacf0e4ec93b6bf Mon Sep 17 00:00:00 2001
|
||||
From: Sandro <devel@penguinpee.nl>
|
||||
Date: Sat, 19 Apr 2025 14:10:45 +0200
|
||||
Subject: [PATCH] Set CMake policy version lower bound to 3.5
|
||||
|
||||
Also specify upper bound as 4.0.
|
||||
|
||||
With CMake 4.0 policies before 3.5 will be dropped. CMake 4.0 also
|
||||
requires the upper bound to be specified.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
android/app/CMakeLists.txt | 2 +-
|
||||
android/app/thirdparty_libs/fribidi/CMakeLists.txt | 2 +-
|
||||
android/app/thirdparty_libs/libunibreak/CMakeLists.txt | 2 +-
|
||||
crengine/Tools/blend-algo-test/CMakeLists.txt | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 254b8cd6f..ab952eccf 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
PROJECT(cr3)
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
|
||||
|
||||
diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
|
||||
index a0a7a42a1..66578ab59 100644
|
||||
--- a/android/app/CMakeLists.txt
|
||||
+++ b/android/app/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
# Sets the minimum version of CMake required to build the native library.
|
||||
|
||||
-cmake_minimum_required(VERSION 3.4.1)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
project(cr3engine)
|
||||
|
||||
diff --git a/android/app/thirdparty_libs/fribidi/CMakeLists.txt b/android/app/thirdparty_libs/fribidi/CMakeLists.txt
|
||||
index 9ccbb7ed5..db31dcc4d 100644
|
||||
--- a/android/app/thirdparty_libs/fribidi/CMakeLists.txt
|
||||
+++ b/android/app/thirdparty_libs/fribidi/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
project(local_fribidi C)
|
||||
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
set(FRIBIDI_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_FRIBIDI_SRCDIR}")
|
||||
set(FRIBIDI_CONFIG_DIR "${PROJECT_SOURCE_DIR}")
|
||||
diff --git a/android/app/thirdparty_libs/libunibreak/CMakeLists.txt b/android/app/thirdparty_libs/libunibreak/CMakeLists.txt
|
||||
index 728fcda7c..2265d6b9b 100644
|
||||
--- a/android/app/thirdparty_libs/libunibreak/CMakeLists.txt
|
||||
+++ b/android/app/thirdparty_libs/libunibreak/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
project(local_unibreak C)
|
||||
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
set(LIBUNIBREAK_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src")
|
||||
|
||||
diff --git a/crengine/Tools/blend-algo-test/CMakeLists.txt b/crengine/Tools/blend-algo-test/CMakeLists.txt
|
||||
index 29157ca61..1e35279a5 100644
|
||||
--- a/crengine/Tools/blend-algo-test/CMakeLists.txt
|
||||
+++ b/crengine/Tools/blend-algo-test/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
project(blend-algo-test C)
|
||||
|
||||
-cmake_minimum_required(VERSION 2.6.2)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
include_directories(${CMAKE_BINARY_DIR})
|
||||
@@ -8,19 +8,22 @@
|
||||
qttools,
|
||||
fribidi,
|
||||
libunibreak,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "coolreader";
|
||||
version = "3.2.57";
|
||||
version = "3.2.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buggins";
|
||||
repo = "coolreader";
|
||||
rev = "cr${version}";
|
||||
sha256 = "sha256-ZfgaLCLvBU6xP7nx7YJTsJSpvpdQgLpSMWH+BsG8E1g=";
|
||||
sha256 = "sha256-DUcYUFxPPSPvoEUEbKYEAGxFeFGQCfOFA0+SegoC4oI=";
|
||||
};
|
||||
|
||||
patches = [ ./cmake_policy_version_3_5.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -30,6 +33,7 @@ mkDerivation rec {
|
||||
qttools
|
||||
fribidi
|
||||
libunibreak
|
||||
zstd
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.0.5436";
|
||||
version = "6.0.5504";
|
||||
|
||||
subsurfaceSrc = (
|
||||
fetchFromGitHub {
|
||||
owner = "Subsurface";
|
||||
repo = "subsurface";
|
||||
rev = "2d3f73c2e1dd5d1f42419708866e40d973989d24";
|
||||
hash = "sha256-dB7KKXbQOmyzlzAKDlFTGJDa/XIKQeKsiCt+dPeP9EU=";
|
||||
rev = "28ad7132d2283a3fc06872de6526bc19c077d203";
|
||||
hash = "sha256-PQwBfm4oPGLU1HRFIcbgTYOYLeVhmEBgN5U8fnUMMlQ=";
|
||||
fetchSubmodules = true;
|
||||
}
|
||||
);
|
||||
|
||||
@@ -85,9 +85,9 @@ rec {
|
||||
|
||||
nomad_1_11 = generic {
|
||||
buildGoModule = buildGo125Module;
|
||||
version = "1.11.0";
|
||||
hash = "sha256-ETC9zJVup/BLivsBWVez5/OLpl7cjdlIRACVK9ga3Io=";
|
||||
vendorHash = "sha256-WqGWEjaPicpmkARSEQ/bqw8+GSemh1fcM3pb4BGjZpU=";
|
||||
version = "1.11.1";
|
||||
hash = "sha256-xP3wSxDo59hme9G4+ATfGD0LTdf11+c/cSfPoKfeBLc=";
|
||||
vendorHash = "sha256-CXWaEwJCKzggyCrHsa+PrLnQNQKI8G14uWno2NAvOwU=";
|
||||
license = lib.licenses.bsl11;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
|
||||
@@ -45,13 +45,13 @@
|
||||
"vendorHash": "sha256-weHY7ZV3HaFBYlDNhwAYN9vDItkI+wtk9UNlM0uuwfY="
|
||||
},
|
||||
"aliyun_alicloud": {
|
||||
"hash": "sha256-i53+JvEr5K4/RCsk5Kfa1Nbox1/KfsgXjX5wCa4zd7o=",
|
||||
"hash": "sha256-WDFoyj4DxHiS1xIu8bPKUzHaVsGn88rIBzx3KoE8lA0=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.266.0",
|
||||
"rev": "v1.267.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-xRoj0X06lhoVXFLfrV8ganqsyzc4PFk+6R2Jx67VIpE="
|
||||
"vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-G6eQeoxIeuUJK7LF8gByOrNP27i3p0OccZNxL2DxDw0=",
|
||||
@@ -715,11 +715,11 @@
|
||||
"vendorHash": "sha256-BUxnKxr0htpdSSTMzb3ix1nNlX7PTBv38ozDjnZ2eK8="
|
||||
},
|
||||
"huaweicloud_huaweicloud": {
|
||||
"hash": "sha256-MQq3fbDXJdULy0xutWmWRmgKa3STny3qsklxgL/z/28=",
|
||||
"hash": "sha256-8GsGyWBkeHy+7MOrjn6r8Q67EDBycU0FEFILabJvkWA=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.82.4",
|
||||
"rev": "v1.83.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wxmaxima";
|
||||
version = "25.04.0";
|
||||
version = "26.01.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxMaxima-developers";
|
||||
repo = "wxmaxima";
|
||||
rev = "Version-${finalAttrs.version}";
|
||||
hash = "sha256-AEy2a8BahV1yH67RIjcsVipuo5eUZcQZxR3HygSYGlU=";
|
||||
hash = "sha256-RoFOmBro8Oo6P3gglaz8ofkrhwxnwy6Rf0po3jOY5D4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qt6,
|
||||
wrapQtAppsHook,
|
||||
|
||||
# before that => zeal
|
||||
sqlite,
|
||||
json_c,
|
||||
mecab,
|
||||
libzip,
|
||||
mpv,
|
||||
yt-dlp,
|
||||
# optional
|
||||
makeWrapper,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "memento";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ripose-jp";
|
||||
repo = "Memento";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IvzvlToSyA20FWU0x+wgE3rT0dYbuY6xyaGgz1D1f6Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
qt6.qtwayland
|
||||
sqlite
|
||||
json_c
|
||||
libzip
|
||||
mecab
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ mpv ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/memento" \
|
||||
--prefix PATH : "${yt-dlp}/bin" \
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mpv-based video player for studying Japanese";
|
||||
homepage = "https://ripose-jp.github.io/Memento/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ teto ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "memento";
|
||||
};
|
||||
})
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-shaderfilter";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-shaderfilter";
|
||||
rev = version;
|
||||
sha256 = "sha256-1RRGXAzP7BIwJJMmXSknPDtHxXZex9SqDDVbWOE43Yk=";
|
||||
sha256 = "sha256-QMN2zMhT125sQ2bFAZ5oMcqfYaRo/wwyerCqGKNCszM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -43,9 +43,13 @@ stdenv.mkDerivation rec {
|
||||
"--with-c-client-target=slx"
|
||||
];
|
||||
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/372699
|
||||
# See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074804
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/372699
|
||||
# See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074804
|
||||
"-Wno-incompatible-pointer-types"
|
||||
# Opt out of C23 (and its stricter prototype rules) in GCC15
|
||||
"-std=gnu17"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
nodejs_22,
|
||||
pkg-config,
|
||||
anytype-heart,
|
||||
libsecret,
|
||||
@@ -32,6 +33,9 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
npmDepsHash = "sha256-hJJK/RJnSm8QpjGcnxUsemrAsRNYCHSGSH8iUZZYXJI=";
|
||||
|
||||
# npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
|
||||
nodejs = nodejs_22;
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
};
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
callPackage,
|
||||
cmake,
|
||||
espeak-ng,
|
||||
fetchpatch2,
|
||||
ffmpeg,
|
||||
file,
|
||||
freetype,
|
||||
@@ -164,17 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
popd
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Upstream patch to support ffmpeg 8
|
||||
(fetchpatch2 {
|
||||
name = "0001-build-fix-build-with-latest-ffmpeg.patch";
|
||||
url = "https://chiselapp.com/user/letoram/repository/arcan/vpatch?from=cc6f24de2134282a&to=25bbde5eec7033d3";
|
||||
hash = "sha256-i8d/X/xmEGWpO9fG6BerW//JnosPwDolXvMFsuv39IM=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/platform/posix/paths.c \
|
||||
--replace-fail "/usr/bin" "$out/bin" \
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
|
||||
{
|
||||
@@ -7,13 +8,14 @@
|
||||
let
|
||||
self = {
|
||||
pname = "arcan";
|
||||
version = "0.7.0.1";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
tag = self.version;
|
||||
hash = "sha256-AbIMZOyEvRQzlmNetImLnBBoSaFUsy4k1NNSO0mI8FI=";
|
||||
hash = "sha256-rADO6xLkUa3iIOSOR96fr1mR7wAUJpsSPoVn+CTNyOo=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
nodejs_22,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ares-cli";
|
||||
version = "3.2.1";
|
||||
@@ -14,6 +16,8 @@ buildNpmPackage rec {
|
||||
hash = "sha256-L8suZDtXVchVyvp7KCv0UaceJqqGBdfopd5tZzwj3MY=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
dontNpmBuild = true;
|
||||
npmDepsHash = "sha256-ATIxe/sulfOpz5KiWauDAPZrlfUOFyiTa+5ECFbVd+0=";
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atlantis";
|
||||
version = "0.38.0";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5V+2MgVcxq3DtMkBeA64mUaSL3zYG/+c1SbChaRbQ98=";
|
||||
hash = "sha256-/p8NfggweRHz8+BBrD/d166HJmDLkDzWloWearfqwVg=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-bdZn2cNSpmV1nngQWBFkf2G0uxlJF1UX50oMZYU7+i0=";
|
||||
vendorHash = "sha256-d137hKsd1GrVW2fXZJTUCQmOayolSjNiJNmoOtj3ZkE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -80,13 +80,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ausaxs";
|
||||
version = "1.1.2";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AUSAXS";
|
||||
repo = "AUSAXS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-83ZgplSZmY/2DZXG1t+/4+gzlv/YusRFeDRqNuie0JA=";
|
||||
hash = "sha256-/d6EXDn60ap7dluJZtVP5vGiJTn4ggF7XYZ6ONGipDs=";
|
||||
};
|
||||
|
||||
patches = [ ./cmake-no-fetchcontent.patch ];
|
||||
@@ -134,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = ''
|
||||
cp --recursive lib/* $out/lib/
|
||||
cp --recursive bin $out/bin
|
||||
rm $out/bin/scripts
|
||||
cp --recursive ../scripts $out/bin/scripts
|
||||
'';
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "autocorrect";
|
||||
version = "2.16.2";
|
||||
version = "2.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huacnlee";
|
||||
repo = "autocorrect";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IpBEmgZ40CFHMISP4tRzt2c2bE2Di9tn8e+/YJPg9RA=";
|
||||
hash = "sha256-SRG603v6yP8/p3aUgGKRdbZScd818A+WqizcyPXaGB4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sn+72+Qq7qppaiiiMS46RXVhFcm27lCPgXmAIYORKU8=";
|
||||
cargoHash = "sha256-4CuvHOXGXUPN46HbiblVa6gSVA+jkYbo7i4uRFWc5+0=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -29,6 +29,6 @@ buildDotnetModule rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ anpin ];
|
||||
mainProgram = "CredentialProvider.Microsoft";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,16 +21,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "23.2.12";
|
||||
version = "23.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sJ2Kf2xslaztQhhPWioGEnQZVW0pBu5apcUOQrpkr+Y=";
|
||||
hash = "sha256-sCzb6ZGpMwG6C66hMeuYmlnEj/ZNau8UieBTfCjdbXw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RC93b6mGPqqPPs6wqNuwyf3vE8wr/uGArA3wIFh+dO8=";
|
||||
npmDepsHash = "sha256-oq7Lcn9yrtOGbIkyWDsoqlOzt6Dj6EvKKhZKwFlSF1k=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "beads";
|
||||
version = "0.27.2";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "steveyegge";
|
||||
repo = "beads";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PpuyQCQocmOqt4EYDsjx1nh0dRxt2e7Vu1/KQ74B88Q=";
|
||||
hash = "sha256-3t+pm7vuFj3PH1oCJ/AnwbGupqleimNQnP2bRSBHrSg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5p4bHTBB6X30FosIn6rkMDJoap8tOvB7bLmVKsy09D8=";
|
||||
vendorHash = "sha256-ovG0EWQFtifHF5leEQTFvTjGvc+yiAjpAaqaV0OklgE=";
|
||||
|
||||
subPackages = [ "cmd/bd" ];
|
||||
|
||||
|
||||
@@ -108,6 +108,7 @@ buildNpmPackage' rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
dart-sass
|
||||
jq
|
||||
makeWrapper
|
||||
napi-rs-cli
|
||||
@@ -131,12 +132,7 @@ buildNpmPackage' rec {
|
||||
fi
|
||||
|
||||
# force our dart-sass executable
|
||||
substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
|
||||
--replace-fail "dart-sass/src/sass.snapshot" "dart-sass/src/sass.snapshot.disabled"
|
||||
|
||||
for f in $(find node_modules/ -name sass -type f -executable); do
|
||||
ln -sf ${lib.getExe dart-sass} $f
|
||||
done
|
||||
echo "export const compilerCommand = ['dart-sass'];" > node_modules/sass-embedded/dist/lib/src/compiler-path.js
|
||||
|
||||
pushd apps/desktop/desktop_native/napi
|
||||
npm run build
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bottom";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClementTsang";
|
||||
repo = "bottom";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+VfXxLKIdrg+ytmx29TPm46t3yhAgqBSJ+ykiIjuNmA=";
|
||||
hash = "sha256-arbVp0UjapM8SQ99XQCP7c+iGInyuxxx6LMEONRVl6o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dvU/iAgLC0+l8FH1bnOdIvZrXHqltE1hMkf+IaLQZxE=";
|
||||
cargoHash = "sha256-miSMcqy4OFZFhAs9M+zdv4OzYgFxN2/uBo6V/kJql90=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoAddDriverRunpath
|
||||
|
||||
Generated
+5
@@ -194,6 +194,11 @@
|
||||
"version": "2.14.1",
|
||||
"hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
|
||||
},
|
||||
{
|
||||
"pname": "JetBrains.Annotations.Sources",
|
||||
"version": "2025.2.2",
|
||||
"hash": "sha256-9Aui689O6j0E34FSwTLGEwar5etuswWg3FU7+mIzpdU="
|
||||
},
|
||||
{
|
||||
"pname": "libsodium",
|
||||
"version": "1.0.18.2",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "2.2.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "btcpayserver";
|
||||
repo = "btcpayserver";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-W6344r+Doz2aiYebeY3+UkFW7dq4aH/GUGqYyxnK4II=";
|
||||
hash = "sha256-0R39jyQaHiei8jXS8gPmkpolC2EcLusLPIMj6Q5iycE=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
||||
@@ -23,7 +23,7 @@ let
|
||||
in
|
||||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
version = "5.0";
|
||||
version = "5.1";
|
||||
pname = "buku";
|
||||
pyproject = true;
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonApplication rec {
|
||||
owner = "jarun";
|
||||
repo = "buku";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-b3j3WLMXl4sXZpIObC+F7RRpo07cwJpAK7lQ7+yIzro=";
|
||||
sha256 = "sha256-7ezAhKqykTpnfyK4+BLr/7+GBH720GxnEnkoJ/AIL08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,16 +60,7 @@ buildPythonApplication rec {
|
||||
]
|
||||
++ lib.optionals withServer serverRequire;
|
||||
|
||||
preCheck = ''
|
||||
# Disables a test which requires internet
|
||||
substituteInPlace tests/test_bukuDb.py \
|
||||
--replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \
|
||||
--replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \
|
||||
--replace "self.assertEqual(url, \"https://www.google.com\")" ""
|
||||
substituteInPlace setup.py \
|
||||
--replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1
|
||||
''
|
||||
+ lib.optionalString (!withServer) ''
|
||||
preCheck = lib.optionalString (!withServer) ''
|
||||
rm tests/test_{server,views}.py
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
pkg-config,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
libgit2,
|
||||
openssl,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-codspeed";
|
||||
version = "3.0.5";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CodSpeedHQ";
|
||||
repo = "codspeed-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vQGPROaTkEwvKw+4aPpS1whUwfeqBcYWJTIKm4KnIiw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ofVgb+9YUNiCPhRZHY3Fm1nXRZK+9Uq8pc5XAm3P6oU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1bFd35JScS3x0ttfSyNUgtB9xgtVUMRl4oUOn2r+t5M=";
|
||||
cargoHash = "sha256-xcLs2Tdi7wp7F5Jwl1QvEC1wQeK7pBjBZKxGVrzqzu0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
@@ -35,10 +35,17 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "-p=cargo-codspeed" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
checkFlags = [
|
||||
# requires an extra dependency, blit
|
||||
"--skip=test_package_in_deps_build"
|
||||
|
||||
# requires criteron, which requires additional dependencies
|
||||
"--skip=test_cargo_config_rustflags"
|
||||
|
||||
# requires additional dependencies
|
||||
"--skip=test_criterion_build_and_run_filtered_by_name"
|
||||
"--skip=test_criterion_build_and_run_filtered_by_name_single"
|
||||
];
|
||||
|
||||
env = {
|
||||
@@ -46,14 +53,14 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v${finalAttrs.version}";
|
||||
description = "Cargo extension to build & run your codspeed benchmarks";
|
||||
homepage = "https://github.com/CodSpeedHQ/codspeed-rust";
|
||||
changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${src.rev}";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = [ ];
|
||||
mainProgram = "cargo-codspeed";
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -19,6 +20,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu17";
|
||||
|
||||
preCheck = "HOME=$(mktemp -d)";
|
||||
|
||||
checkFlags = [
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cat9";
|
||||
version = "0-unstable-2024-06-17";
|
||||
version = "0-unstable-2025-12-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "letoram";
|
||||
repo = "cat9";
|
||||
rev = "f00e8791c1826065d4a93ace12e55ab5732d17a7";
|
||||
hash = "sha256-xFw6r7SQK0T5j7hVK3U39U2Q/qZow6Ad/R0Cl6nqUQw=";
|
||||
rev = "8d2b30545c3e87c8f2e161d755b53c23a48bcf05";
|
||||
hash = "sha256-KSXfa7K8SxnyPmSNCXZs8C+gGYxkLRu0MFbJ3cotSEQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cdncheck";
|
||||
version = "1.2.16";
|
||||
version = "1.2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wwBVFADPjN1KydWDsZO5tea0aRJlyIU6zTEDXLXm6P8=";
|
||||
hash = "sha256-9Xzmy5Q1VW32OYXkMwFyfhT5Tbm2SPn+STr9VFylWrw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0aaneqeIlp+vBRdR5REOq3JOvFS0DOSH6RBo+OmaytU=";
|
||||
vendorHash = "sha256-02/aSv5YYA62I3Wc27OJyPWO9YxFG4dKokgEswu9fzg=";
|
||||
|
||||
subPackages = [ "cmd/cdncheck/" ];
|
||||
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "cheating-daddy";
|
||||
version = "0.4";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sohzm";
|
||||
repo = "cheating-daddy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yoUHBxiuwFdHF5uvQEFrjONnqBdks5gJgTvX1ME5Vv8=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-w1Kd9V9MQvsWiVHr9pRPVLkds+Aj/dsZg6Xvj0vWWVg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-HNI0I02tWXJ0Th9oownQ/akXITBs3RlVFpnnmt6kINw=";
|
||||
npmDepsHash = "sha256-fMvzHrljOm43Dj0uJcqCj6QWd6qosARainhW9WSE348=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clair";
|
||||
version = "4.8.0";
|
||||
version = "4.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quay";
|
||||
repo = "clair";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-itIjDdTKQ0PCfOkefXxqu6MpdWK3F1j6ArvaInQd/hc=";
|
||||
hash = "sha256-YZ2r9hzTvsyTFqlXGcmdABtNuBkKclPLmDfMl5/vCug=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CpIOQiEjQGC6qeoxRS/jFohUnELefAX0KOERudL6BGM=";
|
||||
vendorHash = "sha256-W9ITDut+/QpFMO+c7fNHBfL83bD7ILBEMsF2G9kPYwQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "coc-markdownlint";
|
||||
version = "0-unstable-2025-12-01";
|
||||
version = "0-unstable-2026-01-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-markdownlint";
|
||||
rev = "5a3b292e791e7d33bacac8e9e952aef3aab9f867";
|
||||
hash = "sha256-EaJjeaR8cfqGy2I7nLxPlNyiq4ERpWqUF9i/LloOJaQ=";
|
||||
rev = "40ed0685b2849e77bc8769e3ab1171ced542c5e3";
|
||||
hash = "sha256-rHFkypWQKjfHGeiij2DMldAKXVjghkxB/5mGIjIpS9k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-DCHrO+cuSepnBHl4miLivFElSmSbgH/NRQH68zSJAVA=";
|
||||
npmDepsHash = "sha256-8ex8JdtSREFl59cT5Mu/PtmjyjMG7PU7IJ31wStp+8I=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "0-unstable-2025-12-23";
|
||||
version = "0-unstable-2026-01-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-rust-analyzer";
|
||||
rev = "e64fabb840a35ad1feeedc88b181dd8593c88d8b";
|
||||
hash = "sha256-npAMi7652BUG4coQjkLIcWcSQ4kH+aDwZXsPsLCeZdY=";
|
||||
rev = "ffb3c8af18c7c86e05f335d2a614d1a88bd61a3e";
|
||||
hash = "sha256-8d4GCWpVSwlGn2HSB56/Nll4U+YPx4aupRBxkOUUAr8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Qksi1G4YeFU94mIccyMpphER9d/UiCOriqbe0w7LA6c=";
|
||||
npmDepsHash = "sha256-PgMgpVoKmhuqtSV73wSdqdQ5Bt5AeRwbn71mIulBh8Y=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "coroot";
|
||||
version = "1.11.4";
|
||||
version = "1.17.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m8rh969hac6D5KaSH5BvIQGJ+0qTAfyoK/cKCidt4N8=";
|
||||
hash = "sha256-MeHRWrRGvp5oOSiMXtXNMZtKA6Q2577ty47HOxtBGJk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1yKb8CuNcwpHWC0eDIs2Ml3H7xGYaTCGxyrtuyLvd8c=";
|
||||
vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/front";
|
||||
hash = "sha256-inZV+iv837+7ntBae/oLSNLxpzoqEcJNPNdBE+osJHQ=";
|
||||
hash = "sha256-6a8eOPgAdpZpdXmrHVw/twfikjjWHSy/BdYdlyRQkjc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppad";
|
||||
version = "20250000.3";
|
||||
version = "20260000.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "CppAD";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nxndrOAgmEbMSVLz66E3X/r35NSgiOvNJnF9BY/IOd0=";
|
||||
hash = "sha256-P8FUcW0AjMTqG7TVtdM6/v+ctyNQXJsImC26bpxz/i8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,21 +9,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "crossplane-cli";
|
||||
version = "2.0.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crossplane";
|
||||
repo = "crossplane";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EIDrBQmtMaHlapVNUYABKejIj1I02g5R5h4cADZvtAg=";
|
||||
hash = "sha256-ODqNay4wmbo770ZBpGSH/Zm2Y2vVmUC6PfTzv9CyZns=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8VqKtWbnDGbmgxT13v2d4+nXHouZ4hi2c2m66SAd1KM=";
|
||||
vendorHash = "sha256-90TwfDBb5COEGqjDIoUrZVWS/N8A14ZxbrvvFVgMTNU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/crossplane/crossplane/internal/version.version=v${version}"
|
||||
"-X github.com/crossplane/crossplane/v2/internal/version.version=v${version}"
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/crank" ];
|
||||
@@ -34,7 +34,7 @@ buildGoModule rec {
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = crossplane-cli;
|
||||
command = "crossplane version || true";
|
||||
command = "crossplane version --client || true";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "csharpier";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
executables = "csharpier";
|
||||
|
||||
nugetHash = "sha256-kgVQpFxQmMT/eoWkGyA8A0z//p7VponlyYF+CV7Txs8=";
|
||||
nugetHash = "sha256-VevPiNTtfRJvmK/eYlJtJEJkYkiSvRoP7nTq7q9Bs9I=";
|
||||
|
||||
meta = {
|
||||
description = "Opinionated code formatter for C#";
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "deezer-enhanced";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb";
|
||||
hash = "sha256-n7/yEzr40ApBzE+kLWehgMHwkoom4QT9fYLSuFqVA7s=";
|
||||
hash = "sha256-PRq5R0AXCsW+cEuf1EU+o7g6oa8K5jGAphoNC8cSNFw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -65,7 +65,7 @@ maven.buildMavenPackage rec {
|
||||
'';
|
||||
|
||||
mvnJdk = jre_headless;
|
||||
mvnHash = "sha256-HZK/o/RMbMj7OUfucizO5/LpJhwNhHfwbyvUOcO13dA=";
|
||||
mvnHash = "sha256-Y4imt+eB9KrLN6f1X5CqYoj0FiGU/6ST79R5tK4rWw4=";
|
||||
manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
|
||||
buildOffline = true;
|
||||
|
||||
|
||||
@@ -1,29 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libusb-compat-0_1,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
libusb1,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dfu-programmer";
|
||||
version = "0.7.2";
|
||||
version = "1.1.0";
|
||||
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
|
||||
sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dfu-programmer";
|
||||
repo = "dfu-programmer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YhiBD8rpzEVVaP3Rdfq74lhZ0Mu7OEbrMsM3fBL1Kvk";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-libusb_1_0" ];
|
||||
buildInputs = [
|
||||
libusb1
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
# No build configured in source, automake requires ChangeLog to exist
|
||||
preAutoreconf = ''
|
||||
touch ChangeLog
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build bootstrap.sh
|
||||
patchShebangs --build update-bash-completion.sh
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.gpl2;
|
||||
description = "Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
|
||||
mainProgram = "dfu-programmer";
|
||||
homepage = "http://dfu-programmer.sourceforge.net/";
|
||||
homepage = "https://github.com/dfu-programmer/dfu-programmer";
|
||||
maintainers = with lib.maintainers; [
|
||||
mbinns
|
||||
cybardev
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "distgen";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VG9EX9LHoZamBM3PEm5qGpViK39qD+PA8vcHTzvsW+o=";
|
||||
hash = "sha256-w+/aiLv5NCQFD0ItlC+Wy9BuvA/ndDQcLf6Iyb9trF4=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
docker,
|
||||
gotestsum,
|
||||
versionCheckHook,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -20,6 +22,10 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
vendorHash = "sha256-ztA+/4l180UKTKrsqTyysDcD4oQSDgnBYUaiKDF6LvI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
docker
|
||||
gotestsum
|
||||
@@ -53,6 +59,13 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd '${finalAttrs.meta.mainProgram}' \
|
||||
--bash <("$out/bin/${finalAttrs.meta.mainProgram}" completion bash) \
|
||||
--zsh <("$out/bin/${finalAttrs.meta.mainProgram}" completion zsh) \
|
||||
--fish <("$out/bin/${finalAttrs.meta.mainProgram}" completion fish)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Language server for providing language features for file types in the Docker ecosystem (Dockerfiles, Compose files, and Bake files)";
|
||||
homepage = "https://github.com/docker/docker-language-server";
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "durden";
|
||||
version = "0-unstable-2024-06-23";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "letoram";
|
||||
repo = "durden";
|
||||
rev = "dffb94b69355ffa9cda074c1d0a48af74b78c220";
|
||||
hash = "sha256-sBhlBk4vAYwedw4VerUfY80SXbVoEDid54si6qwDeXs=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dWLOLOICcVjqYTw8KAPM2/xgB9mTSEdGGIHD1WSrIvA=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.101.0";
|
||||
version = "1.101.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = "amazon-ecs-agent";
|
||||
hash = "sha256-1+SWffCxmbYf8hUUazrRds7bRwPX11b1HumaCAizsOQ=";
|
||||
hash = "sha256-bD+gA9uPtHNDcg/QC+O9sQk7G4und5dViqS6f7pV0rU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -95,6 +95,8 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--enable-dependency-reduction"
|
||||
"--disable-frontend"
|
||||
# fix build with gcc 15
|
||||
"CFLAGS=-std=gnu17"
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "evhz";
|
||||
version = "unstable-2021-09-20";
|
||||
version = "unstable-2025-10-09";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~iank";
|
||||
repo = "evhz";
|
||||
rev = "35b7526e0655522bbdf92f6384f4e9dff74f38a0";
|
||||
hash = "sha256-lC0CeN9YVhkSiooC59Dbom811jHvPDQcYl+KADUwVdQ=";
|
||||
rev = "189e6c22a9acb01b6eea26659f6944e60f6cb3d8";
|
||||
hash = "sha256-p2KH5wpw8PpsICutUnwrKmKPtQ/MauWb+DY55WIJPkE=";
|
||||
};
|
||||
|
||||
buildPhase = "gcc -o evhz evhz.c";
|
||||
|
||||
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "f3d";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nZXz5FiGAcDqTi5hlSH7rq2QazhqYg1IoNDog35dygA=";
|
||||
fetchLFS = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fabric-ai";
|
||||
version = "1.4.364";
|
||||
version = "1.4.369";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielmiessler";
|
||||
repo = "fabric";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XOvvT13L2vOQiq0gYeWdRP/H+mu0BI47koG+DzvuAhg=";
|
||||
hash = "sha256-azji8qBX+pxhUo3kH2WdyfMSJSDKEjLSzb5JnweHefU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-U7oVc7DiFWdnEfemSDtmo4XYJj/564qDOZzQX0AVOqc=";
|
||||
vendorHash = "sha256-147i0ZnNtph5DhaxK330kyUkDA4MBcpzrtIJGBEJHHQ=";
|
||||
|
||||
# Fabric introduced plugin tests that fail in the nix build sandbox.
|
||||
doCheck = false;
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
electron_38,
|
||||
electron_39,
|
||||
dart-sass,
|
||||
mpv,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm,
|
||||
@@ -14,16 +15,16 @@
|
||||
}:
|
||||
let
|
||||
pname = "feishin";
|
||||
version = "1.0.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffvli";
|
||||
repo = "feishin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-otobV3bpANbhrAiscDxV1IGJ36i/37aPei6wdo5SDSw=";
|
||||
hash = "sha256-acNUXvmj964pO8h2fsGfex2BeIshExMWe0w/QmtikkM=";
|
||||
};
|
||||
|
||||
electron = electron_38;
|
||||
electron = electron_39;
|
||||
in
|
||||
buildNpmPackage {
|
||||
inherit pname version;
|
||||
@@ -39,8 +40,8 @@ buildNpmPackage {
|
||||
version
|
||||
src
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-iZs2YtB0U8RpZXrIYHBc/cgFISDF/4tz+D13/+HlszU=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-gQooubVt2kDOGq4GEZIT+pQcPnzss9QmqTO9kD5Kx58=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
@@ -97,6 +98,7 @@ buildNpmPackage {
|
||||
mkdir -p $out/{Applications,bin}
|
||||
cp -r dist/**/Feishin.app $out/Applications/
|
||||
makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin \
|
||||
--prefix PATH : "${lib.makeBinPath [ mpv ]}" \
|
||||
--set DISABLE_AUTO_UPDATES 1
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
@@ -110,6 +112,7 @@ buildNpmPackage {
|
||||
# Set ELECTRON_FORCE_IS_PACKAGED=1.
|
||||
# https://github.com/electron/electron/issues/35153#issuecomment-1202718531
|
||||
makeWrapper ${lib.getExe electron} $out/bin/feishin \
|
||||
--prefix PATH : "${lib.makeBinPath [ mpv ]}" \
|
||||
--add-flags $out/share/feishin/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
gzip,
|
||||
gitMinimal,
|
||||
deno,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fresh";
|
||||
version = "0.1.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sinelaw";
|
||||
repo = "fresh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OA5foQEAs01bAi78c6tEaLKaQHcRhRVtNkwpOjbPgEQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/sJ956ZqtI1xV0JW3RwRd0b5pYW2W/vQhb9ApF61eF0=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gzip
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
# Tests create a local http server to check update functionality
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# Due to issues with incorrect import paths with the actual app, I have disabled the checks below. Need to report upstream.
|
||||
checkFlags = [
|
||||
"--skip=e2e::"
|
||||
];
|
||||
cargoTestFlags = [
|
||||
"--lib"
|
||||
"--bins"
|
||||
];
|
||||
|
||||
# The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
|
||||
# To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
|
||||
env.RUSTY_V8_ARCHIVE = deno.librusty_v8;
|
||||
preBuild = ''
|
||||
mkdir -p $out/share/fresh-editor/plugins/
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/bin/fresh.dSYM
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Terminal-based text editor with LSP support and TypeScript plugins";
|
||||
homepage = "https://github.com/sinelaw/fresh";
|
||||
changelog = "https://github.com/sinelaw/fresh/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
chillcicada
|
||||
dwt
|
||||
];
|
||||
mainProgram = "fresh";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode # librusty_v8.a
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatus";
|
||||
version = "5.33.1";
|
||||
version = "5.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TwiN";
|
||||
repo = "gatus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m7dOgxk1EuyqIuVK4ZDimqZX015Osk5FF+0/SFAkp90=";
|
||||
hash = "sha256-+Ulttz13SzPnB+EFsyK2H/bv2vXn+uA/zv6UY9HKrgY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T4BPCDYR/f2rInLNytaVibE2hKWsIYqpJw9asY0TbvY=";
|
||||
vendorHash = "sha256-xN38oaMcErkq4FtWi/Kzp9fhC5dk8CeJYehlwtVgf0M=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-cola";
|
||||
version = "4.16.1";
|
||||
version = "4.17.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-cola";
|
||||
repo = "git-cola";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rNu0D3mbGP9cEtVekwSgvjUoTKQkoLx6VuSbyXJEqjY=";
|
||||
hash = "sha256-no4yvAjrg6q7L3PrMHSLrbm21myL9rXnKvOYjXrY1lw=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-oauth";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hickford";
|
||||
repo = "git-credential-oauth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T10QGMp6keneUzdz7p/4huySIJFp4AmX253pZ3hYSYY=";
|
||||
hash = "sha256-uzgWFjrX2Ux5/nn2EOcWaN4IQX3xmZJASuwdfvq1/Zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-g6HT0hmY2RQceSOigH2bVj1jXYhXq95xL0Qak7TMx0o=";
|
||||
vendorHash = "sha256-ActdfhT4SOWFjXz9XXx1AAnfRQbdTeID79dI8L+WuIc=";
|
||||
|
||||
postInstall = ''
|
||||
installManPage $src/git-credential-oauth.1
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
pkg-config,
|
||||
openssl,
|
||||
zlib,
|
||||
git,
|
||||
git-lfs,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "git-xet";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "xet-core";
|
||||
tag = "git-xet-v${finalAttrs.version}";
|
||||
hash = "sha256-XnCp9Dt4isFsT124ZVA/ID5y9l4bCSBQRrqrIPpv5Ow=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0xUik5zHO4T2PjFXrA0XHuy2892piE5Kiw2pcpa7xdY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
# Build only the git_xet package
|
||||
buildAndTestSubdir = "git_xet";
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
git-lfs
|
||||
];
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Git LFS plugin that uploads and downloads using the Xet protocol";
|
||||
homepage = "https://github.com/huggingface/xet-core/blob/main/git_xet/README.md";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "git-xet";
|
||||
maintainers = with lib.maintainers; [
|
||||
cybardev
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitea-mcp-server";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.com";
|
||||
owner = "gitea";
|
||||
repo = "gitea-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Wrqy8RpDoK8GYldjGiTs8zwB3qzApKYJyK5Vhh0fMRg=";
|
||||
hash = "sha256-3Lc9GJTg4W9Hz5wbOm2MkcCt0aBWneNc8OutIJsBRTg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N1Ct479Q5RH4TCxcSbIBoGDP/atBlWkxwBLJLk82juM=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.20.6";
|
||||
version = "1.20.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B3Hbj9T2ZefH9c/Zlgi7odInuIH96tFtyhrQLIiZPpU=";
|
||||
hash = "sha256-2GILbG7pnkaaoUQkTMTt+1GLpUPfbz3gbPV+a49ERh0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goatcounter";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arp242";
|
||||
repo = "goatcounter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MF4ipSZfN5tAphe+gde7SPAypyi1uRyaDBv58u3lEQE=";
|
||||
hash = "sha256-BVKz1vPYDOpaBdurR1wjg1Jo+qncqrIbZuDVmlFAO9I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cwR3wCRbvISKyhHCnIYDIGSZ+1DowfGT4RAkF/d6F5Q=";
|
||||
vendorHash = "sha256-ICbtL6O1Kbig2WgbLCVSSe9MbIrYWmxYn4M2R5mwv/c=";
|
||||
subPackages = [ "cmd/goatcounter" ];
|
||||
modRoot = ".";
|
||||
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
# Build fails with Go 1.25, with the following error:
|
||||
# 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
|
||||
# Wait for upstream to update their vendored dependencies before unpinning.
|
||||
buildGo124Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
buildGo124Module rec {
|
||||
pname = "gorm-gentool";
|
||||
version = "0.0.1";
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotify-server";
|
||||
version = "2.7.3";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SPWJH5WELBNJpnGZdyMCJGi6m2WbV7BFOQAtT9ItZJ0=";
|
||||
hash = "sha256-wLkJ7zBz89e+ECuaNDcbOzHsA9Xiuz9jrqujnd4Mdzc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bSU7Y+Hupdd8l7LTyVc3YMlZJRojNRqiogE17m/xpr8=";
|
||||
vendorHash = "sha256-vcrMWCNVqDMlIgamb0fBekNrb8qMj2Cb0b7KZbqJ1yg=";
|
||||
|
||||
# No test
|
||||
doCheck = false;
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-0OIxoT7iS7i3E1fD6E/6+WVYZcu2r+Qa7KBX56+CzIk=";
|
||||
hash = "sha256-nU1K43ucv2DnDcIDee6I2t8fgz86NSyNvth2znlclsM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -41,7 +41,7 @@ let
|
||||
owner = "videostreaming";
|
||||
repo = "Grayjay.Desktop";
|
||||
tag = version;
|
||||
hash = "sha256-AKFPPfz5Cbk6fI0H6E3Q+KUvPW4YbVSKcQZUrJCyHeE=";
|
||||
hash = "sha256-cnOhyaeoDXPaeRJnJpx1HcegWitcfMJe/vezxZ/zpFQ=";
|
||||
fetchSubmodules = true;
|
||||
fetchLFS = true;
|
||||
};
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gridtracker2";
|
||||
version = "2.251106.7";
|
||||
version = "2.260101.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gridtracker.org";
|
||||
repo = "gridtracker2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g1njDFodCHvILZZNrI/exAqWLZsbNBGHy3jlzo3uLJ8=";
|
||||
hash = "sha256-Gtz5/caaDAIwG/vqtOO9w5ouysAIzQgD7GcTvXri8T8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8bhOfLLsNSK+/mXku5ukLr65bfk+RwC3SyOGRHndqVQ=";
|
||||
|
||||
+1388
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "grunt-cli";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntjs";
|
||||
repo = "grunt-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-t1J6JLrY2H6ND/T2sl/3/6BZf4nFbUJs1dYvknRbs5s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-SJmgMDw+BBm6NGUzFD4q5PVAZvYXelpM1d20xvL9U9c=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "The grunt command line interface";
|
||||
homepage = "https://github.com/gruntjs/grunt-cli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
mainProgram = "grunt";
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
perlPackages.buildPerlPackage {
|
||||
pname = "ham-unstable";
|
||||
version = "2025-02-25";
|
||||
version = "2025-11-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kernkonzept";
|
||||
repo = "ham";
|
||||
rev = "81b6f05fd91865c7d42b94a683388504489356dc";
|
||||
hash = "sha256-a1JaUD/jrF7Yf+vyUoKQFjojxenmsCVw3Uo8u7RjPiQ=";
|
||||
rev = "11c8b146f8b11e7f284050fe205ae8afb1715541";
|
||||
hash = "sha256-SlraTVE03UEF5Spjy6ZEPbhS/INBR/9MaRLw4/AxZds=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "0.17.4";
|
||||
version = "0.17.6";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "heimdall-proxy";
|
||||
@@ -15,10 +15,10 @@ buildGoModule {
|
||||
owner = "dadrus";
|
||||
repo = "heimdall";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0/2q+ci6bvat8oI3MW/QfI747RDuk55LNciy7RSNLZE=";
|
||||
hash = "sha256-1QnKOxn1m91zu2HOfMyVYFHaHFrw8qn8288tv5HEiiA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3ecwQ6CHPbOouDJzDZA0S/8aJ0lUbhVnZcGby/iCxDk=";
|
||||
vendorHash = "sha256-iX6vt8e9oPPUqHvX6n3OqiafKlP/SmWkfUJBRev7VZQ=";
|
||||
|
||||
tags = [ "sqlite" ];
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highscore-sameboy";
|
||||
version = "0-unstable-2025-12-31";
|
||||
version = "0-unstable-2026-01-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "SameBoy";
|
||||
rev = "80e1d0b5aef4098539979a4670882d590ac9a1ca";
|
||||
hash = "sha256-Fp9GODDu0170NoCHCfX5+vs8hQccS/P1N4jM+L784+o=";
|
||||
rev = "80578af6531ac2da2a9ba76318e8e1dab856fabe";
|
||||
hash = "sha256-LB0HTcTNEe9WlxTi8xwYsbas0SX6Cs2VNo/ljyrcxzQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/highscore";
|
||||
|
||||
@@ -13,18 +13,18 @@
|
||||
}:
|
||||
let
|
||||
pname = "homebox";
|
||||
version = "0.21.0";
|
||||
version = "0.22.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysadminsmedia";
|
||||
repo = "homebox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JA0LawQHWLCJQno1GsajVSsLG3GGgDp2ttIa2xELX48=";
|
||||
hash = "sha256-0/pf7jShuoME6it8GPXJ7ugoRLVfpEzu2uaUW0XFwJg=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-fklNsQEqAjbiaAwTAh5H3eeANkNRDVRuJZ8ithJsfZs=";
|
||||
vendorHash = "sha256-pAMWPMZV5U7hIKNNFgRyyqZEH3wjUCplo7cQfKh1A6g=";
|
||||
modRoot = "backend";
|
||||
# the goModules derivation inherits our buildInputs and buildPhases
|
||||
# Since we do pnpm thing in those it fails if we don't explicitly remove them
|
||||
@@ -42,7 +42,7 @@ buildGoModule {
|
||||
src = "${src}/frontend";
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-gHx4HydL33i1SqzG1PChnlWdlO5NFa5F/R5Yq3mS4ng=";
|
||||
hash = "sha256-5AEwgI5rQzp/36USr+QEzjgllZkKhhIvlzl+9ZVfGM4=";
|
||||
};
|
||||
pnpmRoot = "../frontend";
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlauncher";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprlauncher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-slOlmNtNSqtVvmkZErkwFjGxsLioDUp0l1xXt+g8ggo=";
|
||||
hash = "sha256-nu3pMtkMwKsEhpBE4XMpayXDGdnrXVXrscSsxp7qf1I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
}:
|
||||
ags.bundle {
|
||||
pname = "hyprpanel";
|
||||
version = "0-unstable-2025-12-24";
|
||||
version = "0-unstable-2026-01-03";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -45,8 +45,8 @@ ags.bundle {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jas-SinghFSU";
|
||||
repo = "HyprPanel";
|
||||
rev = "17ecff630bece1ac81569e427088ee8b11322f36";
|
||||
hash = "sha256-xgMcrwKhFSQeSQN7ak0iUHNsnxaprEzuRYRo2ADeTtg=";
|
||||
rev = "b8c255b610f045925e3e41b946a29db99639fcfe";
|
||||
hash = "sha256-Sa3EOZHlhD1JwyxbxLzVm3C9d6pe7Iitcad5FofOeaI=";
|
||||
};
|
||||
|
||||
# keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
@@ -64,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ln -sv $out/include/iniparser/*.h $out/include/
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ironwail";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/andrei-drexler/ironwail/archive/refs/tags/v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-IcODVQ0FgfTi74cvJnM6cPh/Der1bbltdTTo5hITUeI=";
|
||||
hash = "sha256-TlEMuwmpQIoIyjyQo9T/h3T7rPHX+K8TqHKSt+UtMBg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.pname}-${finalAttrs.version}/Quake";
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
obfs4,
|
||||
iproute2,
|
||||
dnscrypt-proxy,
|
||||
v2ray,
|
||||
iptables,
|
||||
gawk,
|
||||
util-linux,
|
||||
@@ -37,25 +38,27 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace daemon/service/platform/platform_linux.go \
|
||||
--replace 'openVpnBinaryPath = "/usr/sbin/openvpn"' \
|
||||
--replace-fail 'openVpnBinaryPath = "/usr/sbin/openvpn"' \
|
||||
'openVpnBinaryPath = "${openvpn}/bin/openvpn"' \
|
||||
--replace 'routeCommand = "/sbin/ip route"' \
|
||||
--replace-fail 'routeCommand = "/sbin/ip route"' \
|
||||
'routeCommand = "${iproute2}/bin/ip route"'
|
||||
|
||||
substituteInPlace daemon/netinfo/netinfo_linux.go \
|
||||
--replace 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \
|
||||
--replace-fail 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \
|
||||
'retErr := shell.ExecAndProcessOutput(log, outParse, "", "${iproute2}/bin/ip", "route")'
|
||||
|
||||
substituteInPlace daemon/service/platform/platform_linux_release.go \
|
||||
--replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
|
||||
--replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
|
||||
--replace-fail 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
|
||||
--replace-fail 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
|
||||
'obfsproxyStartScript = "${lib.getExe obfs4}"' \
|
||||
--replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
|
||||
--replace-fail 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
|
||||
'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \
|
||||
--replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
|
||||
--replace-fail 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
|
||||
'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \
|
||||
--replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
|
||||
'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"'
|
||||
--replace-fail 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
|
||||
'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"' \
|
||||
--replace-fail 'v2rayBinaryPath = path.Join(installDir, "v2ray/v2ray")' \
|
||||
'v2rayBinaryPath = "${v2ray}/bin/v2ray"'
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
@@ -82,6 +85,7 @@ buildGoModule (finalAttrs: {
|
||||
iptables
|
||||
gawk
|
||||
util-linux
|
||||
iproute2
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ivy";
|
||||
version = "0.3.4";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "robpike";
|
||||
repo = "ivy";
|
||||
hash = "sha256-/Q929ZXv3F6MZ+FdWKfbThNDT3JpvQw7WLGnbmitdOg=";
|
||||
hash = "sha256-O+CQUS2EYPnRf8AbL2arhF7m5vhPUnDFXJsYst9/Eqg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user