Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -10,7 +10,12 @@ let
|
||||
dataDir = "/var/db/veilid-server";
|
||||
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
configFile = settingsFormat.generate "veilid-server.conf" cfg.settings;
|
||||
|
||||
configFile = settingsFormat.generate "veilid-server.conf" (
|
||||
lib.converge (lib.filterAttrsRecursive (
|
||||
_: v: v != null && v != { } && v != "" && v != [ ]
|
||||
)) cfg.settings
|
||||
);
|
||||
in
|
||||
{
|
||||
config = mkIf cfg.enable {
|
||||
@@ -157,13 +162,13 @@ in
|
||||
};
|
||||
protected_store = {
|
||||
allow_insecure_fallback = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
type = lib.types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "If we can't use system-provided secure storage, should we proceed anyway?";
|
||||
};
|
||||
always_use_insecure_storage = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
type = lib.types.nullOr types.bool;
|
||||
default = null;
|
||||
description = "Should we bypass any attempt to use system-provided secure storage?";
|
||||
};
|
||||
directory = mkOption {
|
||||
@@ -189,11 +194,11 @@ in
|
||||
network = {
|
||||
routing_table = {
|
||||
bootstrap = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ "bootstrap.veilid.net" ];
|
||||
type = lib.types.nullOr (types.listOf types.str);
|
||||
default = null;
|
||||
description = "Host name of existing well-known Veilid bootstrap servers for the network to connect to.";
|
||||
};
|
||||
node_id = lib.mkOption {
|
||||
public_keys = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = "Base64-encoded public key for the node, used as the node's ID.";
|
||||
@@ -201,8 +206,8 @@ in
|
||||
};
|
||||
dht = {
|
||||
min_peer_count = mkOption {
|
||||
type = types.number;
|
||||
default = 20;
|
||||
type = lib.types.nullOr types.number;
|
||||
default = null;
|
||||
description = "Minimum number of nodes to keep in the peer table.";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -508,13 +508,13 @@
|
||||
"vendorHash": "sha256-tsAxy5dt8mKtfR2o8dNgFSdjgjfIXD0ye004wPZ6fTk="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-DXjGZCaDFLnp2cNoexi3eL3c13PYe4uiUNr4wxwG+GY=",
|
||||
"hash": "sha256-68SdqhF4RA/rjVm89yAZb8MRdDPrcqrQ6lc3tJTIeng=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-awscc",
|
||||
"rev": "v1.74.0",
|
||||
"rev": "v1.77.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-/lITCpxw41IbRbyBj0OaeAo5Ldb2I6j2MUlaZ9OcG0U="
|
||||
"vendorHash": "sha256-tlxuUXJAAP/9hmyEJI9foMD+CeOosFrXfp/06fZVvSA="
|
||||
},
|
||||
"hashicorp_azuread": {
|
||||
"hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=",
|
||||
@@ -923,13 +923,13 @@
|
||||
"vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
|
||||
},
|
||||
"mongodb_mongodbatlas": {
|
||||
"hash": "sha256-ACrBRB5QVn6LGnNtZFFG74wF4zJubZo7ryrfWdt7aFY=",
|
||||
"hash": "sha256-8TcFJv8e9CJOzF+Fy0QvB2juTvyGAxUvgSKCL3fGYDM=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v2.7.0",
|
||||
"rev": "v2.9.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-DNCA+qN/aQOYYmDJ/jt0Scn58e27nonLfjkqJCRkBro="
|
||||
"vendorHash": "sha256-mgGmFrP/LhjHiYvxKtGBe2S/ZBHn2qT7eX5eBvNjxk8="
|
||||
},
|
||||
"namecheap_namecheap": {
|
||||
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "2.4.2";
|
||||
hash = "sha256-uOW0gOernPRb+3fkupTISiQ34An0HEMFrdH0mjmFLKQ=";
|
||||
version = "2.4.3";
|
||||
hash = "sha256-NTtQMHK/IzAYHKb1lxClUUJkyJpeLo7mKRCAR1GaUTo=";
|
||||
patches = _: [
|
||||
# Fix loading extended modules.
|
||||
./load-extended-modules.patch
|
||||
|
||||
@@ -106,12 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
|
||||
|
||||
postConfigure = lib.optionalString (lib.strings.versionAtLeast version "2.4") ''
|
||||
substituteInPlace src/lib-regex/Makefile --replace-fail \
|
||||
"test_regex_DEPENDENCIES = libdregex.la \$(LIBPCRE_LIBS)" \
|
||||
"test_regex_DEPENDENCIES = libdregex.la"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
sed -i -E \
|
||||
-e 's!/bin/sh\b!${stdenv.shell}!g' \
|
||||
@@ -174,6 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-lucene"
|
||||
"--with-icu"
|
||||
"--with-textcat"
|
||||
"--with-lua=${lib.boolToYesNo withLua}"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"i_cv_epoll_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
|
||||
@@ -195,7 +190,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "--enable-static"
|
||||
++ lib.optional withLDAP "--with-ldap"
|
||||
++ lib.optional withPCRE2 "--with-pcre2"
|
||||
++ lib.optional withLua "--with-lua"
|
||||
++ lib.optional withMySQL "--with-mysql"
|
||||
++ lib.optional withPgSQL "--with-pgsql"
|
||||
++ lib.optional withSQLite "--with-sqlite";
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
import ./generic.nix {
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
url =
|
||||
{
|
||||
version,
|
||||
dovecotMajorMinor,
|
||||
}:
|
||||
"https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-pigeonhole-${version}.tar.gz";
|
||||
hash = "sha256-nXiBii9LGe6VkGKkUBpvlntuvkQbqhAOqeSwwJb/ghE=";
|
||||
hash = "sha256-LQNhqYnBVICabluj8F07UOZR5frt6bd9JSyuHJDS6hc=";
|
||||
patches = fetchpatch: [
|
||||
./max_lookup_size.patch
|
||||
# https://github.com/NixOS/nixpkgs/pull/388463#issuecomment-3066016707
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dovecot/pigeonhole/commit/517d74aa1d98b853b72608ce722bc58009c0f4a9.patch";
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
openssl,
|
||||
libstemmer,
|
||||
perl,
|
||||
python3,
|
||||
withLDAP ? true,
|
||||
cyrus_sasl,
|
||||
openldap,
|
||||
@@ -68,10 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional withLDAP "--with-ldap";
|
||||
|
||||
preBuild = lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.isDarwin) ''
|
||||
preBuild = lib.optionalString (!isCurrent && stdenv.isDarwin) ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
|
||||
'';
|
||||
|
||||
# https://github.com/dovecot/pigeonhole/blob/2.4.3/src/plugins/settings/Makefile.am#L43-L44
|
||||
makeFlags = lib.optionals isCurrent [
|
||||
"PYTHON=${python3.pythonOnBuildForHost.interpreter}"
|
||||
"SETTINGS_HISTORY_PY=${dovecot}/libexec/dovecot/settings-history.py"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/lib-sieve/plugins/extlists/ext-extlists-settings.h
|
||||
+++ b/src/lib-sieve/plugins/extlists/ext-extlists-settings.h
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
const char *name;
|
||||
/* Maximum size of lookup value */
|
||||
- size_t max_lookup_size;
|
||||
+ uoff_t max_lookup_size;
|
||||
|
||||
struct {
|
||||
const char *name;
|
||||
@@ -1,19 +1,19 @@
|
||||
{
|
||||
"version": "1.0.9",
|
||||
"version": "1.0.12",
|
||||
"x86_64-linux": {
|
||||
"name": "copilot-linux-x64",
|
||||
"hash": "sha256-FwRLHgibSeqOuq142SRIuPbIw8YVHgSgmwuH41kvWD0="
|
||||
"hash": "sha256-QqFZO9BNWz+8e4BC9KtxYO9M3y5jey5sx7jMpx37WfY="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"name": "copilot-linux-arm64",
|
||||
"hash": "sha256-YFaVWsztnMBG3xo4DSAPzlEAMTPLRCYUt34G8M7/yls="
|
||||
"hash": "sha256-IBJt89WfdXqT/7txzzvAXcQxwk04Fu3iWwbJOOD0b6w="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"name": "copilot-darwin-x64",
|
||||
"hash": "sha256-YdraXVwpfVMPVnzuDCHTdKmuHlgjlAPzwagzDKW5RsE="
|
||||
"hash": "sha256-TGbWhAlLVs3oAPVwgBXQpmB/yPUYNjeZX8k32qcosJ4="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"name": "copilot-darwin-arm64",
|
||||
"hash": "sha256-pzXgRrr9dryBVaM2taf1JSidG2zgDa9Sx66Mew4zQZU="
|
||||
"hash": "sha256-mrCdZwv/f0MummttAvMxlJbAfolZaGqIG9Q+UToeYVM="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import ./generic.nix {
|
||||
hash = "sha256-DgPSH5t1Zx2X9T8dbpz54M5nXNcCJbdfcq9AEd8kmYo=";
|
||||
version = "6.0.6";
|
||||
version = "6.0.6-unstable-2026-03-27";
|
||||
vendorHash = "sha256-bVJwg9VaiSgfpKo+e2oMsYgmaKk42dktq0pahcfbjp0=";
|
||||
rev = "d0f2c86fcb4a7d38343807c83ea3541bb4661e1e";
|
||||
patches = [
|
||||
# qemu 9.1 compat, remove when added to LTS
|
||||
./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import ./generic.nix {
|
||||
hash = "sha256-KanD657VNxcf7xjFkEoQZJz3hB12KOuAAEInNZoQmcY=";
|
||||
version = "6.22.0";
|
||||
vendorHash = "sha256-9ksX6/atzRkPCXrMZj0q+sEV0RY9UJ1QgGmc4YWs2Uw=";
|
||||
hash = "sha256-I+wwpsFGDX0W7pwzROGW1ZDHx+C7uc61ypO45BzOhoE=";
|
||||
version = "6.23.0";
|
||||
vendorHash = "sha256-R4q0FNu33qZrHrZQTqPCfw7FNUv6itl7y2AxdRF19CQ=";
|
||||
patches = [ ];
|
||||
nixUpdateExtraArgs = [
|
||||
"--override-filename=pkgs/by-name/in/incus/package.nix"
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "11.0.0";
|
||||
version = "11.1.0";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-wQx35dJV5GXFqKeo6JYzKeCsFlALX5NQJFYIMIW32GI=";
|
||||
hash = "sha256-70WFRCtc3h/Asy5ZZooW3Sg/lngPF4Nk4oPm/q/phGA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
fontforge,
|
||||
potrace,
|
||||
texlive,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
/*
|
||||
@@ -34,6 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "02ik25aczkbi10jrjlnxby3fmixxrwm2k5r4fkfif3bjfym7nqbc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "gcc-15.patch";
|
||||
url = "https://salsa.debian.org/debian/mftrace/-/raw/628987e5ce8bdab737f9fbc730a75fdd29ce81d2/debian/patches/gcc-15.patch";
|
||||
hash = "sha256-eTDohSGzy2hxZmpAXiYaAk3DBnrXduNum0fO6bHGUQw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
autoreconfHook
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "minify";
|
||||
version = "2.24.10";
|
||||
version = "2.24.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdewolff";
|
||||
repo = "minify";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mpSnELFSaSg+BCzGQs2gmKA91imtRq6UZNIxzBvueTc=";
|
||||
hash = "sha256-AroyZI6bF4nPdGk01pd0hueoVH4690+aWN9MZCz5FJY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Mbqzgn6GvdIFqeZPEHJoyxXvrivzpq77BbRQALwWnsI=";
|
||||
vendorHash = "sha256-gH9HiNYAARImEdA4TESg8BXuedhs3Priv7dgZwcnrHU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
# function correctly.
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "prisma-engines_7";
|
||||
version = "7.3.0";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-a4skrL5r6tfFMMD+yikm5wgkiAOXom6FC5fuAYPzT5I=";
|
||||
hash = "sha256-1hvIgTqqCN20VQny/4rTr2d5LP0Tt9lYa8ugsIY0CqY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DkuqGzcHHqW3u6ZVz6xCJjeF+l8Y44pYMNaeFjb7vIc=";
|
||||
cargoHash = "sha256-uiFvzxwVJXCW9LUDFRC6ZkzSa7LQk+9ZJcaJw8mrBX4=";
|
||||
|
||||
# Use system openssl.
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prisma_7";
|
||||
version = "7.3.0";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-X3tLHUJ+tSjo4DPgmo43KMXHPP5BZK14kCj7sBgjPu8=";
|
||||
hash = "sha256-afUbvr3O4ipw2e+SSFpTsE4YCP32M48YepRYI+gs++Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-HkEoPY0rrRZL53EI1NupnWnCMvtcViSVA2GIiwBr8wo=";
|
||||
hash = "sha256-g++JoJ4UnLdfSyFBYZyx1vzcpPRe7FTIdpCjNuGhDeY=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
gtk3,
|
||||
lame,
|
||||
libxml2_13,
|
||||
ffmpeg,
|
||||
libjack2,
|
||||
ffmpeg_4-headless,
|
||||
vlc,
|
||||
xdg-utils,
|
||||
xdotool,
|
||||
@@ -20,7 +21,7 @@
|
||||
openssl,
|
||||
|
||||
jackSupport ? stdenv.hostPlatform.isLinux,
|
||||
jackLibrary,
|
||||
jackLibrary ? libjack2, # Another option is "pipewire.jack"
|
||||
pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
|
||||
libpulseaudio,
|
||||
}:
|
||||
@@ -119,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
lame
|
||||
libxml2_13
|
||||
ffmpeg
|
||||
ffmpeg_4-headless
|
||||
vlc
|
||||
xdotool
|
||||
stdenv.cc.cc
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
let
|
||||
version = "0.23a";
|
||||
debianRevision = "12";
|
||||
debianRevision = "16";
|
||||
debianPatch =
|
||||
patchname: hash:
|
||||
fetchpatch {
|
||||
name = "${patchname}.patch";
|
||||
url = "https://sources.debian.org/data/main/r/rrootage/${version}-${debianRevision}/debian/patches/${patchname}.patch";
|
||||
sha256 = hash;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
in
|
||||
@@ -27,21 +27,23 @@ stdenv.mkDerivation {
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz";
|
||||
sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln";
|
||||
hash = "sha256-lk7b4hgC4+QNao2hm2ETLeys0Tv5pxushqvOASN5/wc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(debianPatch "01_makefile" "0wgplznx9kgb82skwqplpydbpallgrby3w662h52wky5zl0pyijj")
|
||||
(debianPatch "02_data_dir" "12vw60s94by3f6k8pk45k555h4y7gzlqfds0a96nrrryammpgnq3")
|
||||
(debianPatch "03_texture_filename" "1qxkxy6821xvanacf25mi43wj8nf40c1qiyavhc8av798xprpkjh")
|
||||
(debianPatch "04_home" "0s15b0liv40jzjd9l4zsq688ky1yp9b1gmb1xhi3bih4y7q9awdz")
|
||||
(debianPatch "05_gcc" "06ihgbfrklabs7cb6216w1jjb9sglv86iagzhhmyydwyph4fb782")
|
||||
(debianPatch "06_rrootage_highres" "0ifjmh236yiv3g896nfwwydgcnq3njdb8ldah7s3jxp3xkpvwcga")
|
||||
(debianPatch "07_use_system_bulletml" "1sxsl1yzx3msvz8mf0jk1vnahqb1ahq9drm391idgh0afy77l6j7")
|
||||
(debianPatch "08_windowed_mode" "0knx4g445ngilsz4dvdkq69f5f8i2xv2fnmdmq037xd5rhfg0b23")
|
||||
(debianPatch "09_rootage_make_highres_default" "1zqz8s54rl8jmqmvdi9c3ayfcma6qkbfkx5vw0fzyn268wcs022p")
|
||||
(debianPatch "10_deg_out_of_range" "1wr76az4rlv1gaj9xdknzqcjazw6h8myqw6y3753q259hxbq4cah")
|
||||
(debianPatch "01_makefile" "sha256-UkZ/Af3FTy4KFMbw4Vd+lKq7mr/0Yj61QOvN1O2n93E=")
|
||||
(debianPatch "02_data_dir" "sha256-A9t3a1U+52xNUkA3h+l/xxNYSpmFzIumccMvkjQwfIs=")
|
||||
(debianPatch "03_texture_filename" "sha256-UM6bb0fpbIUY3MpHHBggziLJB4m1CMeUVbsHgYzvs+M=")
|
||||
(debianPatch "04_home" "sha256-v3GV8PEExjUi7GHVF1a6PviJkMH6E5qa/BKQHSlYJWg=")
|
||||
(debianPatch "05_gcc" "sha256-Ap3lCLyeN+8rhP+paNCmT6clZeAmCLPY0UvRmd16MBo=")
|
||||
(debianPatch "06_rrootage_highres" "sha256-6jG+7+zjdjn0gapRtJq0A1v2mufcWZPQGzt6MwSs0kU=")
|
||||
(debianPatch "07_use_system_bulletml" "sha256-Rxp6jncKwNdiSKPmljBUYWGo7A5TAlfR37qO/n2guus=")
|
||||
(debianPatch "08_windowed_mode" "sha256-QyzwHMyl9TMArq1aJ3YXEbniksGz7Ua+pvHZQsgj3U4=")
|
||||
(debianPatch "09_rootage_make_highres_default" "sha256-VwigGUdGWP8d4Lv06dbERlXmvBosxbYrrhLRTIpGH/8=")
|
||||
(debianPatch "10_deg_out_of_range" "sha256-UDGCV4epCDzKGd5w7CuChn8lGf52tp6kemHTTL4yJ/M=")
|
||||
(debianPatch "11_gcc_15" "sha256-CQSZh+7u8yocn7hn18u9FCFHARhuGeY3YDR13vNPW+A=")
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "src/screen.c" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage"
|
||||
substituteInPlace "src/soundmanager.c" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage"
|
||||
@@ -55,16 +57,20 @@ stdenv.mkDerivation {
|
||||
SDL_mixer
|
||||
bulletml
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"-C src"
|
||||
"-f makefile.lin"
|
||||
];
|
||||
|
||||
hardeningDisable = [
|
||||
"stackprotector"
|
||||
"fortify"
|
||||
]; # buffer overflow without this
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -d "$out"/share/games
|
||||
cp -r rr_share "$out"/share/games/rrootage
|
||||
install -D src/rrootage "$out"/bin/rrootage
|
||||
@@ -75,6 +81,8 @@ stdenv.mkDerivation {
|
||||
install -D -m 644 readme.txt "$out"/share/doc/rrootage/README.jp
|
||||
install -m 644 readme_e.txt "$out"/share/doc/rrootage/README.en
|
||||
install -m 644 readme_linux "$out"/share/doc/rrootage/README
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
|
||||
|
||||
@@ -22,10 +22,10 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-darwin = "sha256-5RCveSh1DJ7o1f8uXpgIi9W5moqOLFVGaGIcfhUfqR8=";
|
||||
aarch64-linux = "sha256-2H5khrs/cLBO8dyqzE7mVIpaFfv1IbMbwk0sd09oqVE=";
|
||||
x86_64-darwin = "sha256-AZ5c+kQZku3idyxvquuNf7FyaqtQsROMCqOOiPS3vUQ=";
|
||||
x86_64-linux = "sha256-OejU4ks8g7Cm5p4QCpcvvHXV/vjc5Hs92sPPkt6oH+M=";
|
||||
aarch64-darwin = "sha256-LOZrfIEB7xJFoH0eertL6zW/US/Tvuy6HN+zJ1gNElI=";
|
||||
aarch64-linux = "sha256-rWJ+d7SWzMraSm4m6v/2mO8IKQgeV1pLrzr4UkuwB0c=";
|
||||
x86_64-darwin = "sha256-mONMar0Ap1p06i0grPnihCQdEwIxMwdtIgxvPKQZ2SA=";
|
||||
x86_64-linux = "sha256-SrhPK0lsQC0+xP0l4OVVn+EYTYhtra6PtEODROwETCI=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
|
||||
@@ -15,9 +15,7 @@ mkTclDerivation rec {
|
||||
hash = "sha256-nPs16Jy6KMEdupWJNhgYqosuW5Dlpb/dxxTrLpRbYf0=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"CFLAGS=-Wno-implicit-function-declaration"
|
||||
];
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -std=gnu17";
|
||||
|
||||
meta = {
|
||||
homepage = "https://auriocus.github.io/VecTcl/";
|
||||
|
||||
@@ -8,20 +8,28 @@
|
||||
pytestCheckHook,
|
||||
pytest-homeassistant-custom-component,
|
||||
pytest-freezer,
|
||||
pytest-cov-stub,
|
||||
home-assistant-frontend,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "amitfin";
|
||||
domain = "oref_alert";
|
||||
version = "4.1.1";
|
||||
version = "6.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amitfin";
|
||||
repo = "oref_alert";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nWp8cG0lFYUEO11lcZGkqx5QvOSfSVnqIqpHA8YAN30=";
|
||||
hash = "sha256-g3Ae2AwdhcBv9v3aFjFAqxCPYVBFtQxsbtVAEOL2A60=";
|
||||
};
|
||||
|
||||
# Do not publish cards, currently broken, attempting to write to nix store.
|
||||
postPatch = ''
|
||||
substituteInPlace custom_components/oref_alert/__init__.py \
|
||||
--replace-fail 'version = await publish_cards(hass)' 'version = "1.0.0"'
|
||||
'';
|
||||
|
||||
dependencies = [
|
||||
aiofiles
|
||||
shapely
|
||||
@@ -30,10 +38,18 @@ buildHomeAssistantComponent rec {
|
||||
|
||||
ignoreVersionRequirement = [ "shapely" ];
|
||||
|
||||
# These tests are broken with cards removed.
|
||||
disabledTestPaths = [
|
||||
"tests/test_custom_cards.py"
|
||||
"tests/test_init.py"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-homeassistant-custom-component
|
||||
pytest-freezer
|
||||
pytest-cov-stub
|
||||
home-assistant-frontend
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10405,11 +10405,6 @@ with pkgs;
|
||||
withXineBackend = true;
|
||||
};
|
||||
|
||||
reaper = callPackage ../applications/audio/reaper {
|
||||
jackLibrary = libjack2; # Another option is "pipewire.jack".
|
||||
ffmpeg = ffmpeg_4-headless;
|
||||
};
|
||||
|
||||
rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { };
|
||||
|
||||
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
|
||||
|
||||
Reference in New Issue
Block a user