Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -703,7 +703,7 @@
|
||||
github = "aduh95";
|
||||
githubId = 14309773;
|
||||
name = "Antoine du Hamel";
|
||||
keys = [ { fingerprint = "C0D6 2484 39F1 D560 4AAF FB40 21D9 00FF DB23 3756"; } ];
|
||||
keys = [ { fingerprint = "5BE8 A3F6 C8A5 C01D 106C 0AD8 20B1 A390 B168 D356"; } ];
|
||||
};
|
||||
aerialx = {
|
||||
email = "aaron+nixos@aaronlindsay.com";
|
||||
|
||||
@@ -245,6 +245,7 @@ rec {
|
||||
--revision ${escapeShellArg revision} \
|
||||
${optionsJSON}/${common.outputPath}/options.json \
|
||||
$out/share/man/man5/configuration.nix.5
|
||||
compressManPages $out
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
@@ -104,6 +104,8 @@
|
||||
|
||||
- `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.
|
||||
|
||||
- `services.ntpd-rs` now performs configuration validation.
|
||||
|
||||
- `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).
|
||||
This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.
|
||||
|
||||
|
||||
@@ -207,6 +207,5 @@ in
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
primeos
|
||||
colemickens
|
||||
];
|
||||
}
|
||||
|
||||
@@ -52,7 +52,11 @@ in
|
||||
systemd.services.govee2mqtt = {
|
||||
description = "Govee2MQTT Service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "networking.target" ];
|
||||
after = [
|
||||
"networking.target"
|
||||
"network-online.target"
|
||||
];
|
||||
requires = [ "network-online.target" ];
|
||||
serviceConfig = {
|
||||
CacheDirectory = "govee2mqtt";
|
||||
Environment = [
|
||||
|
||||
@@ -464,7 +464,7 @@ in
|
||||
};
|
||||
|
||||
SENDMAIL_PATH = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
type = lib.types.str;
|
||||
# somewhat duplicated with useSendmail but cannot be deduped because of infinite recursion
|
||||
default =
|
||||
if config.mailer.ENABLED && config.mailer.PROTOCOL == "sendmail" then
|
||||
|
||||
@@ -354,7 +354,7 @@ in
|
||||
description = ''
|
||||
Attrset of the LibreNMS configuration.
|
||||
See <https://docs.librenms.org/Support/Configuration/> for reference.
|
||||
All possible options are listed [here](https://github.com/librenms/librenms/blob/master/misc/config_definitions.json).
|
||||
All possible options are listed [here](https://github.com/librenms/librenms/blob/master/resources/definitions/config_definitions.json).
|
||||
See <https://docs.librenms.org/Extensions/Authentication/> for setting other authentication methods.
|
||||
'';
|
||||
default = { };
|
||||
|
||||
@@ -9,6 +9,17 @@ let
|
||||
cfg = config.services.ntpd-rs;
|
||||
format = pkgs.formats.toml { };
|
||||
configFile = format.generate "ntpd-rs.toml" cfg.settings;
|
||||
|
||||
validateConfig =
|
||||
file:
|
||||
pkgs.runCommand "validate-ntpd-rs.toml"
|
||||
{
|
||||
nativeBuildInputs = [ cfg.package ];
|
||||
}
|
||||
''
|
||||
ntp-ctl validate -c ${file}
|
||||
ln -s "${file}" "$out"
|
||||
'';
|
||||
in
|
||||
{
|
||||
options.services.ntpd-rs = {
|
||||
@@ -77,7 +88,7 @@ in
|
||||
DynamicUser = true;
|
||||
ExecStart = [
|
||||
""
|
||||
"${lib.makeBinPath [ cfg.package ]}/ntp-daemon --config=${configFile}"
|
||||
"${lib.makeBinPath [ cfg.package ]}/ntp-daemon --config=${validateConfig configFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -90,7 +101,7 @@ in
|
||||
DynamicUser = true;
|
||||
ExecStart = [
|
||||
""
|
||||
"${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${configFile}"
|
||||
"${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${validateConfig configFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -532,7 +532,7 @@ in
|
||||
# required for services generated with writeShellScript and friends
|
||||
pkgs.runtimeShell
|
||||
# some tools like xfs still want the sh symlink
|
||||
"${pkgs.bash}/bin"
|
||||
"${pkgs.bashNonInteractive}/bin"
|
||||
|
||||
# so NSS can look up usernames
|
||||
"${pkgs.glibc}/lib/libnss_files.so.2"
|
||||
|
||||
@@ -2,31 +2,21 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
testers,
|
||||
adrgen,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "adrgen";
|
||||
version = "0.4.0-beta";
|
||||
version = "0.4.1-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asiermarques";
|
||||
repo = "adrgen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2ZE/orsfwL59Io09c4yfXt2enVmpSM/QHlUMgyd9RYQ=";
|
||||
hash = "sha256-9EiJe5shhwbjLIvUQMUTSGTgCA+r3RdkLkPRPoWvZ3g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/asiermarques/adrgen/pull/14
|
||||
(fetchpatch {
|
||||
name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
|
||||
url = "https://github.com/asiermarques/adrgen/commit/485dc383106467d1029ee6d92c9bcbc3c2281626.patch";
|
||||
hash = "sha256-38ktHrRgW5ysQmafvFthNtkZ6nnM61z4yEA7wUGmWb4=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-RXwwv3Q/kQ6FondpiUm5XZogAVK2aaVmKu4hfr+AnAM=";
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
Generated
-2940
File diff suppressed because it is too large
Load Diff
@@ -4,24 +4,19 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "autocorrect";
|
||||
version = "2.14.0";
|
||||
version = "2.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huacnlee";
|
||||
repo = "autocorrect";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Tqg0awxRtzqAVTTVrmN0RDTQvYJllejx8V94jTreZyI=";
|
||||
rev = "5af1bc295d48b0fd04f7dbc35ea99d479f682e78";
|
||||
hash = "sha256-tbN+48a8NnwirJqUci0LgxsvJI0KzuG/aDvV/Yr8Xu8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-cEiIs7wvfjP5/tkRtYb2XEZfssw09zkbOrqZsOX9ajQ=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
@@ -32,14 +27,12 @@ rustPlatform.buildRustPackage rec {
|
||||
"autocorrect-cli"
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)";
|
||||
mainProgram = "autocorrect";
|
||||
homepage = "https://huacnlee.github.io/autocorrect";
|
||||
changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}";
|
||||
changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ definfo ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils curl jq common-updater-scripts cargo
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
version=$(curl -s https://api.github.com/repos/huacnlee/autocorrect/releases/latest | jq -r .tag_name)
|
||||
update-source-version autocorrect "${version#v}"
|
||||
|
||||
tmp=$(mktemp -d)
|
||||
trap 'rm -rf -- "${tmp}"' EXIT
|
||||
|
||||
git clone --depth 1 --branch "${version}" https://github.com/huacnlee/autocorrect.git "${tmp}/autocorrect"
|
||||
cargo generate-lockfile --manifest-path "${tmp}/autocorrect/Cargo.toml"
|
||||
cp "${tmp}/autocorrect/Cargo.lock" "$(dirname "$0")/Cargo.lock"
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.144.3";
|
||||
version = "0.145.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = "cirrus-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aqsPh6pZ2v5ysYoD9rG/ATAPBKUslxlif1uKMPGY6gU=";
|
||||
hash = "sha256-RyT0pR/hcqkvavI4HkWjCG5AS4H5hBbjOChHrUoq2GI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fcaOMSOLcl1rzp4zn6KiojC0ewJMFbyG4+1uod+/6yc=";
|
||||
vendorHash = "sha256-CvypJVRLdMr38Qn8E67IZ33cSq5fYhM3i5HyifXGYNE=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchurl,
|
||||
undmg,
|
||||
makeWrapper,
|
||||
openjdk17,
|
||||
openjdk21,
|
||||
gnused,
|
||||
autoPatchelfHook,
|
||||
wrapGAppsHook3,
|
||||
@@ -76,8 +76,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
mkdir -p $out/opt/dbeaver $out/bin
|
||||
cp -r * $out/opt/dbeaver
|
||||
makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \
|
||||
--prefix PATH : "${openjdk17}/bin" \
|
||||
--set JAVA_HOME "${openjdk17.home}" \
|
||||
--prefix PATH : "${openjdk21}/bin" \
|
||||
--set JAVA_HOME "${openjdk21.home}" \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/lib:${
|
||||
lib.makeLibraryPath [
|
||||
@@ -109,8 +109,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
mkdir -p $out/{Applications/dbeaver.app,bin}
|
||||
cp -R . $out/Applications/dbeaver.app
|
||||
makeWrapper $out/{Applications/dbeaver.app/Contents/MacOS,bin}/dbeaver \
|
||||
--prefix PATH : "${openjdk17}/bin" \
|
||||
--set JAVA_HOME "${openjdk17.home}"
|
||||
--prefix PATH : "${openjdk21}/bin" \
|
||||
--set JAVA_HOME "${openjdk21.home}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go
|
||||
index 2207708e..a7e8a3c2 100644
|
||||
--- a/cmd/dlv/main.go
|
||||
+++ b/cmd/dlv/main.go
|
||||
@@ -21,6 +21,8 @@ func main() {
|
||||
version.DelveVersion.Build = Build
|
||||
}
|
||||
|
||||
+ os.Setenv("disableHardening", "fortify "+os.Getenv("disableHardening"))
|
||||
+
|
||||
const cgoCflagsEnv = "CGO_CFLAGS"
|
||||
if os.Getenv(cgoCflagsEnv) == "" {
|
||||
os.Setenv(cgoCflagsEnv, "-O0 -g")
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
@@ -17,12 +16,14 @@ buildGoModule rec {
|
||||
hash = "sha256-bp8pYWS3Vpg0R2Xfe5agDTENzLGu9r43BgORa8VrP+Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-fortify.diff
|
||||
];
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "cmd/dlv" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
preCheck = ''
|
||||
@@ -38,10 +39,6 @@ buildGoModule rec {
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
postInstall = ''
|
||||
# fortify source breaks build since delve compiles with -O0
|
||||
wrapProgram $out/bin/dlv \
|
||||
--prefix disableHardening " " fortify
|
||||
|
||||
# add symlink for vscode golang extension
|
||||
# https://github.com/golang/vscode-go/blob/master/docs/debugging.md#manually-installing-dlv-dap
|
||||
ln $out/bin/dlv $out/bin/dlv-dap
|
||||
|
||||
@@ -20,17 +20,17 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "dmlive";
|
||||
version = "5.5.8-unstable-2025-04-06";
|
||||
version = "5.6.0-unstable-2025-06-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "THMonster";
|
||||
repo = "dmlive";
|
||||
rev = "b066a637093871de9962e08d4f0ae0b77bd8f1f4"; # no tag
|
||||
hash = "sha256-pAsxr6zGCDZ0qysGT1+2+5+WKI2QopGxnZWpfnxk/fI=";
|
||||
rev = "485eae06737530360c0e6f6415c62791767d595b"; # no tag
|
||||
hash = "sha256-0JjPZPtAtbxdh0HDycWHEonZggBcoqv5SJUnhKzXNIk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-GVko8GK5Muha4uqDMgk7VkFoFCVcmk0vM1GUELvSzgM=";
|
||||
cargoHash = "sha256-B1v9m4Nn5wXMbNBlh7+A8zBejJ0tHdqvSXVpRz+wC5g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,338 +0,0 @@
|
||||
From: Tristan Ross <tristan.ross@midstall.com>
|
||||
Date: Wed, 31 Jul 2024 04:03:03 +0000 (-0700)
|
||||
Subject: Prevent binaries in src from colliding with libc++ headers
|
||||
X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=232b9ede92cbecabbd61291c2fc9aaf3fc61061f;hp=87a60d22299c4ba7b94cbce04a32c2abf015f98a
|
||||
|
||||
Prevent binaries in src from colliding with libc++ headers
|
||||
|
||||
Discovered with Nix and LLVM 17. Headers inside of libc++ can easily
|
||||
collide with binaries being linked in src. This results in clang trying
|
||||
to include a binary as a header.
|
||||
|
||||
Fix this by removing '-I.' and '-I$(srcdir)' from AM_CPPFLAGS and
|
||||
DEFAULT_INCLUDES in src/Makefile.am.
|
||||
|
||||
To facilitate this config/eu.am has been refactored. New file
|
||||
config/eu-common.am contains all of the old eu.am but with the
|
||||
AM_CPPFLAGS definition removed. eu.am now includes eu-common.am and
|
||||
contains the old AM_CPPFLAGS definition.
|
||||
|
||||
eu.am functionality does not change, but src/Makefile.am can instead
|
||||
include eu-common.am and define its own AM_CPPFLAGS without causing a
|
||||
"multiply defined" warning during autoreconf.
|
||||
|
||||
Signed-off-by: Tristan Ross <tristan.ross@midstall.com>
|
||||
---
|
||||
|
||||
diff --git a/config/eu-common.am b/config/eu-common.am
|
||||
new file mode 100644
|
||||
index 00000000..9cc7f696
|
||||
--- /dev/null
|
||||
+++ b/config/eu-common.am
|
||||
@@ -0,0 +1,148 @@
|
||||
+## Common automake fragments for elfutils subdirectory makefiles.
|
||||
+##
|
||||
+## Copyright (C) 2010, 2014, 2016 Red Hat, Inc.
|
||||
+## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org>
|
||||
+##
|
||||
+## This file is part of elfutils.
|
||||
+##
|
||||
+## This file is free software; you can redistribute it and/or modify
|
||||
+## it under the terms of either
|
||||
+##
|
||||
+## * the GNU Lesser General Public License as published by the Free
|
||||
+## Software Foundation; either version 3 of the License, or (at
|
||||
+## your option) any later version
|
||||
+##
|
||||
+## or
|
||||
+##
|
||||
+## * the GNU General Public License as published by the Free
|
||||
+## Software Foundation; either version 2 of the License, or (at
|
||||
+## your option) any later version
|
||||
+##
|
||||
+## or both in parallel, as here.
|
||||
+##
|
||||
+## elfutils is distributed in the hope that it will be useful, but
|
||||
+## WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+## General Public License for more details.
|
||||
+##
|
||||
+## You should have received copies of the GNU General Public License and
|
||||
+## the GNU Lesser General Public License along with this program. If
|
||||
+## not, see <http://www.gnu.org/licenses/>.
|
||||
+##
|
||||
+
|
||||
+DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
|
||||
+
|
||||
+# Drop the 'u' flag that automake adds by default. It is incompatible
|
||||
+# with deterministic archives.
|
||||
+ARFLAGS = cr
|
||||
+
|
||||
+# Warn about stack usage of more than 256K = 262144 bytes.
|
||||
+if ADD_STACK_USAGE_WARNING
|
||||
+STACK_USAGE_WARNING=-Wstack-usage=262144
|
||||
+STACK_USAGE_NO_ERROR=-Wno-error=stack-usage=
|
||||
+else
|
||||
+STACK_USAGE_WARNING=
|
||||
+STACK_USAGE_NO_ERROR=
|
||||
+endif
|
||||
+
|
||||
+if SANE_LOGICAL_OP_WARNING
|
||||
+LOGICAL_OP_WARNING=-Wlogical-op
|
||||
+else
|
||||
+LOGICAL_OP_WARNING=
|
||||
+endif
|
||||
+
|
||||
+if HAVE_DUPLICATED_COND_WARNING
|
||||
+DUPLICATED_COND_WARNING=-Wduplicated-cond
|
||||
+else
|
||||
+DUPLICATED_COND_WARNING=
|
||||
+endif
|
||||
+
|
||||
+if HAVE_NULL_DEREFERENCE_WARNING
|
||||
+NULL_DEREFERENCE_WARNING=-Wnull-dereference
|
||||
+else
|
||||
+NULL_DEREFERENCE_WARNING=
|
||||
+endif
|
||||
+
|
||||
+if HAVE_IMPLICIT_FALLTHROUGH_WARNING
|
||||
+# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the
|
||||
+# warning
|
||||
+if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING
|
||||
+IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5
|
||||
+else
|
||||
+IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough
|
||||
+endif
|
||||
+else
|
||||
+IMPLICIT_FALLTHROUGH_WARNING=
|
||||
+endif
|
||||
+
|
||||
+if HAVE_TRAMPOLINES_WARNING
|
||||
+TRAMPOLINES_WARNING=-Wtrampolines
|
||||
+else
|
||||
+TRAMPOLINES_WARNING=
|
||||
+endif
|
||||
+
|
||||
+if HAVE_NO_PACKED_NOT_ALIGNED_WARNING
|
||||
+NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned
|
||||
+else
|
||||
+NO_PACKED_NOT_ALIGNED_WARNING=
|
||||
+endif
|
||||
+
|
||||
+if HAVE_USE_AFTER_FREE3_WARNING
|
||||
+USE_AFTER_FREE3_WARNING=-Wuse-after-free=3
|
||||
+else
|
||||
+USE_AFTER_FREE3_WARNING=
|
||||
+endif
|
||||
+
|
||||
+AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
|
||||
+ -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
|
||||
+ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
|
||||
+ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
|
||||
+ $(USE_AFTER_FREE3_WARNING) \
|
||||
+ $(if $($(*F)_no_Werror),,-Werror) \
|
||||
+ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
|
||||
+ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
|
||||
+ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
|
||||
+ $($(*F)_CFLAGS)
|
||||
+
|
||||
+AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
|
||||
+ $(TRAMPOLINES_WARNING) \
|
||||
+ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
|
||||
+ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
|
||||
+ $(if $($(*F)_no_Werror),,-Werror) \
|
||||
+ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
|
||||
+ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
|
||||
+ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
|
||||
+ $($(*F)_CXXFLAGS)
|
||||
+
|
||||
+COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
|
||||
+
|
||||
+DEFS.os = -DPIC -DSHARED
|
||||
+if SYMBOL_VERSIONING
|
||||
+DEFS.os += -DSYMBOL_VERSIONING
|
||||
+else
|
||||
+endif
|
||||
+
|
||||
+%.os: %.c %.o
|
||||
+if AMDEP
|
||||
+ $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \
|
||||
+ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
|
||||
+ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
|
||||
+ rm -f "$(DEPDIR)/$*.Tpo"; \
|
||||
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
||||
+ fi
|
||||
+else
|
||||
+ $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $<
|
||||
+endif
|
||||
+
|
||||
+CLEANFILES = *.gcno *.gcda
|
||||
+
|
||||
+textrel_msg = echo "WARNING: TEXTREL found in '$@'"
|
||||
+if FATAL_TEXTREL
|
||||
+textrel_found = $(textrel_msg); exit 1
|
||||
+else
|
||||
+textrel_found = $(textrel_msg)
|
||||
+endif
|
||||
+textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi
|
||||
+
|
||||
+print-%:
|
||||
+ @echo $*=$($*)
|
||||
diff --git a/config/eu.am b/config/eu.am
|
||||
index 0b7dab5b..3aa6048a 100644
|
||||
--- a/config/eu.am
|
||||
+++ b/config/eu.am
|
||||
@@ -1,4 +1,5 @@
|
||||
-## Common automake fragments for elfutils subdirectory makefiles.
|
||||
+## Common automake fragments for elfutils subdirectory makefiles
|
||||
+## with AM_CPPFLAGS set.
|
||||
##
|
||||
## Copyright (C) 2010, 2014, 2016 Red Hat, Inc.
|
||||
## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org>
|
||||
@@ -30,120 +31,5 @@
|
||||
## not, see <http://www.gnu.org/licenses/>.
|
||||
##
|
||||
|
||||
-DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
|
||||
-AM_CPPFLAGS = -iquote . -I$(srcdir) -I$(top_srcdir)/lib -I..
|
||||
-
|
||||
-# Drop the 'u' flag that automake adds by default. It is incompatible
|
||||
-# with deterministic archives.
|
||||
-ARFLAGS = cr
|
||||
-
|
||||
-# Warn about stack usage of more than 256K = 262144 bytes.
|
||||
-if ADD_STACK_USAGE_WARNING
|
||||
-STACK_USAGE_WARNING=-Wstack-usage=262144
|
||||
-STACK_USAGE_NO_ERROR=-Wno-error=stack-usage=
|
||||
-else
|
||||
-STACK_USAGE_WARNING=
|
||||
-STACK_USAGE_NO_ERROR=
|
||||
-endif
|
||||
-
|
||||
-if SANE_LOGICAL_OP_WARNING
|
||||
-LOGICAL_OP_WARNING=-Wlogical-op
|
||||
-else
|
||||
-LOGICAL_OP_WARNING=
|
||||
-endif
|
||||
-
|
||||
-if HAVE_DUPLICATED_COND_WARNING
|
||||
-DUPLICATED_COND_WARNING=-Wduplicated-cond
|
||||
-else
|
||||
-DUPLICATED_COND_WARNING=
|
||||
-endif
|
||||
-
|
||||
-if HAVE_NULL_DEREFERENCE_WARNING
|
||||
-NULL_DEREFERENCE_WARNING=-Wnull-dereference
|
||||
-else
|
||||
-NULL_DEREFERENCE_WARNING=
|
||||
-endif
|
||||
-
|
||||
-if HAVE_IMPLICIT_FALLTHROUGH_WARNING
|
||||
-# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the
|
||||
-# warning
|
||||
-if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING
|
||||
-IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5
|
||||
-else
|
||||
-IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough
|
||||
-endif
|
||||
-else
|
||||
-IMPLICIT_FALLTHROUGH_WARNING=
|
||||
-endif
|
||||
-
|
||||
-if HAVE_TRAMPOLINES_WARNING
|
||||
-TRAMPOLINES_WARNING=-Wtrampolines
|
||||
-else
|
||||
-TRAMPOLINES_WARNING=
|
||||
-endif
|
||||
-
|
||||
-if HAVE_NO_PACKED_NOT_ALIGNED_WARNING
|
||||
-NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned
|
||||
-else
|
||||
-NO_PACKED_NOT_ALIGNED_WARNING=
|
||||
-endif
|
||||
-
|
||||
-if HAVE_USE_AFTER_FREE3_WARNING
|
||||
-USE_AFTER_FREE3_WARNING=-Wuse-after-free=3
|
||||
-else
|
||||
-USE_AFTER_FREE3_WARNING=
|
||||
-endif
|
||||
-
|
||||
-AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
|
||||
- -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
|
||||
- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
|
||||
- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
|
||||
- $(USE_AFTER_FREE3_WARNING) \
|
||||
- $(if $($(*F)_no_Werror),,-Werror) \
|
||||
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
|
||||
- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
|
||||
- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
|
||||
- $($(*F)_CFLAGS)
|
||||
-
|
||||
-AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
|
||||
- $(TRAMPOLINES_WARNING) \
|
||||
- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
|
||||
- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
|
||||
- $(if $($(*F)_no_Werror),,-Werror) \
|
||||
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
|
||||
- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
|
||||
- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
|
||||
- $($(*F)_CXXFLAGS)
|
||||
-
|
||||
-COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
|
||||
-
|
||||
-DEFS.os = -DPIC -DSHARED
|
||||
-if SYMBOL_VERSIONING
|
||||
-DEFS.os += -DSYMBOL_VERSIONING
|
||||
-else
|
||||
-endif
|
||||
-
|
||||
-%.os: %.c %.o
|
||||
-if AMDEP
|
||||
- $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \
|
||||
- -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
|
||||
- then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
|
||||
- rm -f "$(DEPDIR)/$*.Tpo"; \
|
||||
- else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
|
||||
- fi
|
||||
-else
|
||||
- $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $<
|
||||
-endif
|
||||
-
|
||||
-CLEANFILES = *.gcno *.gcda
|
||||
-
|
||||
-textrel_msg = echo "WARNING: TEXTREL found in '$@'"
|
||||
-if FATAL_TEXTREL
|
||||
-textrel_found = $(textrel_msg); exit 1
|
||||
-else
|
||||
-textrel_found = $(textrel_msg)
|
||||
-endif
|
||||
-textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi
|
||||
-
|
||||
-print-%:
|
||||
- @echo $*=$($*)
|
||||
+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
|
||||
+include $(top_srcdir)/config/eu-common.am
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 97a0c61a..5bb8c078 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -16,14 +16,15 @@
|
||||
## You should have received a copy of the GNU General Public License
|
||||
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
##
|
||||
-include $(top_srcdir)/config/eu.am
|
||||
+include $(top_srcdir)/config/eu-common.am
|
||||
DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \
|
||||
-DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
|
||||
|
||||
-DEFAULT_INCLUDES =
|
||||
-AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
|
||||
- -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \
|
||||
- -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod
|
||||
+DEFAULT_INCLUDES = -I$(top_builddir)
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I.. \
|
||||
+ -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
|
||||
+ -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \
|
||||
+ -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod
|
||||
|
||||
AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw $(STACK_USAGE_NO_ERROR)
|
||||
@@ -23,7 +23,6 @@
|
||||
libmicrohttpd,
|
||||
libarchive,
|
||||
gitUpdater,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
# TODO: Look at the hardcoded paths to kernel, modules etc.
|
||||
@@ -36,34 +35,29 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-eFf0S2JPTY1CHfhRqq57FALP5rzdLYBJ8V/AfT3edjU=";
|
||||
};
|
||||
|
||||
patches =
|
||||
[
|
||||
./debug-info-from-env.patch
|
||||
(fetchpatch {
|
||||
name = "fix-aarch64_fregs.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl-asm-ptrace-h.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl-macros.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl-strndupa.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]
|
||||
# Prevent headers and binaries from colliding which results in an error.
|
||||
# https://sourceware.org/pipermail/elfutils-devel/2024q3/007281.html
|
||||
++ lib.optional (stdenv.targetPlatform.useLLVM or false) ./cxx-header-collision.patch;
|
||||
patches = [
|
||||
./debug-info-from-env.patch
|
||||
(fetchpatch {
|
||||
name = "fix-aarch64_fregs.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl-asm-ptrace-h.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl-macros.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl-strndupa.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
|
||||
sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
|
||||
})
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];
|
||||
|
||||
postPatch =
|
||||
''
|
||||
@@ -85,16 +79,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
|
||||
# as the host-bzip2 will be in the path.
|
||||
nativeBuildInputs =
|
||||
[
|
||||
m4
|
||||
bison
|
||||
flex
|
||||
gettext
|
||||
bzip2
|
||||
]
|
||||
++ lib.optional enableDebuginfod pkg-config
|
||||
++ lib.optional (stdenv.targetPlatform.useLLVM or false) autoreconfHook;
|
||||
nativeBuildInputs = [
|
||||
m4
|
||||
bison
|
||||
flex
|
||||
gettext
|
||||
bzip2
|
||||
] ++ lib.optional enableDebuginfod pkg-config;
|
||||
buildInputs =
|
||||
[
|
||||
zlib
|
||||
@@ -119,22 +110,28 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "strictflexarrays3" ];
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
"--program-prefix=eu-" # prevent collisions with binutils
|
||||
"--enable-deterministic-archives"
|
||||
(lib.enableFeature enableDebuginfod "libdebuginfod")
|
||||
(lib.enableFeature enableDebuginfod "debuginfod")
|
||||
# build elfutils out-of-source-tree to avoid ./stack inclusion
|
||||
# as a c++ header on libc++: https://sourceware.org/PR33103
|
||||
preConfigure =
|
||||
if (stdenv.targetPlatform.useLLVM or false) then
|
||||
''
|
||||
mkdir build-tree
|
||||
cd build-tree
|
||||
''
|
||||
else
|
||||
null;
|
||||
configureScript = if (stdenv.targetPlatform.useLLVM or false) then "../configure" else null;
|
||||
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766
|
||||
# Versioned symbols are nice to have, but we can do without.
|
||||
(lib.enableFeature (!stdenv.hostPlatform.isMicroBlaze) "symbol-versioning")
|
||||
]
|
||||
++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler"
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"CFLAGS=-Wno-unused-private-field"
|
||||
"CXXFLAGS=-Wno-unused-private-field"
|
||||
];
|
||||
configureFlags = [
|
||||
"--program-prefix=eu-" # prevent collisions with binutils
|
||||
"--enable-deterministic-archives"
|
||||
(lib.enableFeature enableDebuginfod "libdebuginfod")
|
||||
(lib.enableFeature enableDebuginfod "debuginfod")
|
||||
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766
|
||||
# Versioned symbols are nice to have, but we can do without.
|
||||
(lib.enableFeature (!stdenv.hostPlatform.isMicroBlaze) "symbol-versioning")
|
||||
] ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
ninja,
|
||||
gettext,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
gtk4,
|
||||
glib,
|
||||
@@ -38,29 +37,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "epiphany";
|
||||
version = "48.3";
|
||||
version = "48.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-2ilT5+K3O/dHPAozl5EE15NieVKV6qCio46hiFN9rxM=";
|
||||
hash = "sha256-D2ZVKtZZPHlSo93uW/UVZWyMQ0hxB22fGpGnr5NGsbQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# shell: Fix startup crash on Pantheon
|
||||
# https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1818
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/da4437beb7f1fbc9c2fa3d4629b8c826d484835e.patch";
|
||||
hash = "sha256-meufd5gnhLcK0dgIXEMDnid9e1R2M1D3jZ9Yoh6YobM=";
|
||||
})
|
||||
|
||||
# action-bar-end: Fix startup crash on Pantheon
|
||||
# https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1819
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/d69866854b315123c8832fae58c6de008da20ea0.patch";
|
||||
hash = "sha256-GnZQC4rtBYRr+x9mF8pCFDcDOjEJj+27ECdXBNL42kQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c
|
||||
index 32817df..da65217 100644
|
||||
index 32817df..c8b3f2e 100644
|
||||
--- a/src/EWS/camel/camel-ews-utils.c
|
||||
+++ b/src/EWS/camel/camel-ews-utils.c
|
||||
@@ -1550,7 +1550,7 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C
|
||||
@@ -32,7 +32,7 @@ index 32817df..da65217 100644
|
||||
|
||||
for (ii = 0; strv && strv[ii]; ii++) {
|
||||
diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c
|
||||
index 7374c36..7da2023 100644
|
||||
index 7374c36..dbf9099 100644
|
||||
--- a/src/Microsoft365/camel/camel-m365-store.c
|
||||
+++ b/src/Microsoft365/camel/camel-m365-store.c
|
||||
@@ -305,7 +305,7 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca
|
||||
@@ -65,7 +65,7 @@ index 7374c36..7da2023 100644
|
||||
|
||||
for (ii = 0; strv && strv[ii]; ii++) {
|
||||
diff --git a/src/Microsoft365/common/e-m365-tz-utils.c b/src/Microsoft365/common/e-m365-tz-utils.c
|
||||
index cec5417..2e744a0 100644
|
||||
index cec5417..38f1a87 100644
|
||||
--- a/src/Microsoft365/common/e-m365-tz-utils.c
|
||||
+++ b/src/Microsoft365/common/e-m365-tz-utils.c
|
||||
@@ -192,10 +192,21 @@ e_m365_tz_utils_get_user_timezone (void)
|
||||
@@ -93,7 +93,7 @@ index cec5417..2e744a0 100644
|
||||
if (g_settings_get_boolean (settings, "use-system-timezone"))
|
||||
location = e_cal_util_get_system_timezone_location ();
|
||||
diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c
|
||||
index 3458c10..7d21784 100644
|
||||
index f388e3b..ed57213 100644
|
||||
--- a/src/common/e-ews-common-utils.c
|
||||
+++ b/src/common/e-ews-common-utils.c
|
||||
@@ -208,10 +208,21 @@ e_ews_common_utils_get_configured_icaltimezone (void)
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.56.1";
|
||||
version = "3.56.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-DgC2qxV9j+r7T1HXchusP2IfI4f1WrS7PEPRN0KFrWs=";
|
||||
hash = "sha256-Hrfsz5TGuGGNa0XDICNQIJ21Z8SJEIrcICM8TRn48o8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "8.17.13";
|
||||
version = "8.17.18";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-mCHycRks9HXWhHOA/LbhjPCRjEuyGklgBuvY7e+KXnc=";
|
||||
hash = "sha256-FP6vGezki4BViwLuKisxnCDaOUwFVQB2hag92lrwRyk=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.3.144";
|
||||
version = "0.3.145";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Uk6XeqdNXDs9H1Dzxy2uiF1ulIPoOxtZSoe2XU/6f0Q=";
|
||||
hash = "sha256-fMBKuIzycuBMtkaGZPJmfRhYntER+yFzAA6mTCLuhws=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GWEEhn2O6Wxrd3y7w4h8Qz8/4GA1z++QsrOi9r58Rg8=";
|
||||
vendorHash = "sha256-G+RT2teg1+AoLJRjYKnQtVcGH3sbtrxhklQfGMIod+0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
colemickens
|
||||
lovesegfault
|
||||
];
|
||||
};
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
ninja,
|
||||
gnome,
|
||||
desktop-file-utils,
|
||||
appstream-glib,
|
||||
gettext,
|
||||
itstool,
|
||||
gtk4,
|
||||
@@ -22,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghex";
|
||||
version = "48.alpha";
|
||||
version = "48.beta2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -32,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-QP7kmZfZGhkmYmEXDEi7hy+zBupB+2WnIVBghow73+I=";
|
||||
hash = "sha256-4vIgRVGNgWtG0wluCp075lTdggMBVGX8ck/okWrY70E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -55,11 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glib
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
mesonFlags =
|
||||
[
|
||||
"-Dgtk_doc=true"
|
||||
|
||||
@@ -75,11 +75,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-control-center";
|
||||
version = "48.2";
|
||||
version = "48.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-0uxKXifhkdkvmO1NvEqGHX8axKWiS2UktJKhIAfdRgw=";
|
||||
hash = "sha256-wGmCRaZCC63Qd8Fv+yGIYORXzXMAYScY6r+aukciK64=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,22 +8,22 @@
|
||||
|
||||
let
|
||||
pname = "hoppscotch";
|
||||
version = "25.5.3-0";
|
||||
version = "25.6.0-0";
|
||||
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
|
||||
hash = "sha256-EhwTQ52xUCLSApV2vNo4AqnAznaDaSWDt339pmwJvYU=";
|
||||
hash = "sha256-QeI8BmEJOdzi7eonsLtF4SQaah8LJS+cee5pBbWuHBI=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
|
||||
hash = "sha256-A0Ss6JLcHaH5p7TQ67TVAAre+nt82hxVgZZgFvoBWzA=";
|
||||
hash = "sha256-4CIU+aFo50E1uMWIR1dA6tNCY1qKiMHnBRkGK5x3Ljg=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
|
||||
hash = "sha256-r+gi/vVkVY0QIqunnrDOk6k+Fa/6UOMMGxYdnj4SnIA=";
|
||||
hash = "sha256-+jtDamZaRzBcfrRdlWBqqJlTYfOF0KpunuruBVuSS3Y=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
diff --git a/src/iwd-dbus.conf b/src/iwd-dbus.conf
|
||||
index f2509ebc..a443987d 100644
|
||||
--- a/src/iwd-dbus.conf
|
||||
+++ b/src/iwd-dbus.conf
|
||||
@@ -19,10 +19,6 @@
|
||||
<allow send_destination="net.connman.iwd"/>
|
||||
</policy>
|
||||
|
||||
- <policy group="netdev">
|
||||
- <allow send_destination="net.connman.iwd"/>
|
||||
- </policy>
|
||||
-
|
||||
<policy context="default">
|
||||
<deny send_destination="net.connman.iwd"/>
|
||||
</policy>
|
||||
diff --git a/wired/ead-dbus.conf b/wired/ead-dbus.conf
|
||||
index 8a685e0a..749d0c05 100644
|
||||
--- a/wired/ead-dbus.conf
|
||||
+++ b/wired/ead-dbus.conf
|
||||
@@ -17,10 +17,6 @@
|
||||
<allow send_destination="net.connman.ead"/>
|
||||
</policy>
|
||||
|
||||
- <policy group="netdev">
|
||||
- <allow send_destination="net.connman.ead"/>
|
||||
- </policy>
|
||||
-
|
||||
<policy context="default">
|
||||
<deny send_destination="net.connman.ead"/>
|
||||
</policy>
|
||||
@@ -13,16 +13,22 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "iwd";
|
||||
version = "3.8";
|
||||
version = "3.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
|
||||
rev = version;
|
||||
hash = "sha256-BNGXOiyV+aTHym4EBStVdQ0XekmkFEyx7PqmlG8HcVc=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NY0WB62ehxKH64ssAF4vkF6YroG5HHH+ii+AFG9EaE4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove dbus config referencing the netdev group, which we don't have.
|
||||
# Users are advised to use the wheel group instead.
|
||||
./no_netdev_group.diff
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
@@ -101,14 +107,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
|
||||
description = "Wireless daemon for Linux";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
dtzWill
|
||||
fpletz
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libimobiledevice-glue";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libimobiledevice";
|
||||
repo = "libimobiledevice-glue";
|
||||
rev = version;
|
||||
hash = "sha256-Fu0zQIryESRaTGzDlAaewX9Yo2nPEeUxmcb3yPJLuSI=";
|
||||
hash = "sha256-cUcJARbZV9Yaqd9TP3NVmF9p8Pjz88a3GmAh4c4sEHo=";
|
||||
};
|
||||
|
||||
preAutoreconf = ''
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.5";
|
||||
version = "9.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CVT0HBT4WnlTrT8mhapJjyIbd+pp7uxrZxa9ZlXVm3c=";
|
||||
hash = "sha256-PLQgZdf2As5dwoM/L8SCBCysXUrw56/cn2NDf4jM1ac=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Google's i18n library for parsing and using phone numbers";
|
||||
homepage = "https://github.com/google/libphonenumber";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ illegalprime ];
|
||||
maintainers = with maintainers; [
|
||||
illegalprime
|
||||
wegank
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rakshasa-libtorrent";
|
||||
version = "0.15.4";
|
||||
version = "0.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakshasa";
|
||||
repo = "libtorrent";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-EtT1g8fo2XRVO7pGUThoEklxpYKPI7OWwCZ2vVV73k4=";
|
||||
hash = "sha256-iFndmET8bQUg3iZ6c6WDCzSS2tx6sYJt+fEkPAaNm18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "markdown-oxide";
|
||||
version = "0.25.2";
|
||||
version = "0.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Feel-ix-343";
|
||||
repo = "markdown-oxide";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LXFZAMxg2Mlatwx7d4ozofr7H9nrqDxai9U/oB4vkqA=";
|
||||
hash = "sha256-LBY7hLen6jhOBsOIl9f5rFVH66FbLbuYgLl1xtzTRQg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "maven";
|
||||
version = "3.9.9";
|
||||
version = "3.9.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
|
||||
hash = "sha256-epzfZ0/BcD1jgvXzMLPREOobUStR8WUoRtnk6KWI12Y=";
|
||||
hash = "sha256-4DYFmwrGPNzJNK//qhJcm/P0pM0tK5mV4a7pIZCgl5w=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mitra";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "silverpill";
|
||||
repo = "mitra";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y77wLGmSJbGmqUXURjqp6Gz9+xpMvnUEcB9OZ4uF3M8=";
|
||||
hash = "sha256-nUQVdKzNNfD04dPKb0T1l0TUS5jTkU9l/yUMXmvJx/s=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-sfPnhB1GWIG8tA6Jqr1+03qxwS1DBbRAv4ZY+wKB/jY=";
|
||||
cargoHash = "sha256-D6pD0aAmQh2lmWyfHjB8K7ZKv06Qoru+81ncPvDcyS4=";
|
||||
|
||||
# require running database
|
||||
doCheck = false;
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "21.0.1";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-A4wjnITpI9Cy5kIVljXvmnunsqJXFSi4CqBmlqVcqZM=";
|
||||
sha256 = "sha256-yN+1TnYBRbKAkdzLG0ulMyH6sXQhlUK8d3neYxGsbKE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "48.2";
|
||||
version = "48.6";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
|
||||
hash = "sha256-oIPaV4ZLVLoqPl9IG1QM/L5hiASjZDZoJ3Jw4mNTaf4=";
|
||||
hash = "sha256-7cUDRODf1yR2tcFLOqclyiaHGOpt2JvE7ib0ULM51pY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "papers";
|
||||
version = "48.2";
|
||||
version = "48.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-HpvFlhNCS/ZVIjxr3Khzri8d2ifPAtc0K/9bVZBRYG0=";
|
||||
hash = "sha256-8RqhxUSsIRJZ4jC0DIBK5kB3M5pXve+j2761f5Fm4/0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "privatebin";
|
||||
version = "1.7.6";
|
||||
version = "1.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrivateBin";
|
||||
repo = "PrivateBin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tKzuPpll1GOMlaIDfs5udXrHcTko6jmWJq4dPuPYy6Y=";
|
||||
hash = "sha256-/28uzEDVEn7uy8c6/oCMFjKDJFPyHH50f890cc6fmjg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scalingo";
|
||||
version = "1.35.0";
|
||||
version = "1.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-3a3YlnSMPfWhYqeP12tx1BAe+hfzaYgPfFAz/rU2cMU=";
|
||||
hash = "sha256-cs7LyK9QyjuaLRvvC3M9T12faWSk8xADuYGxbzptY6Q=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "skim";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6pvvZnhvju8JvRy93/128+6AH935UK5NbMx2kxzCjqY=";
|
||||
hash = "sha256-fEd6t+adYI1jpRapZ/XHpxVWtX0nwUl9ZurIwywSFgk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Hg7MWz0QAeI8l9if4QHUcUqU+5UI+H+dYw+ryCuRe/Y=";
|
||||
cargoHash = "sha256-oRcqaXWa/eh5QQtTk0NQr90aL/Q0zgxQbPIoMLMtHe8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "termshot";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homeport";
|
||||
repo = "termshot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fk1Xlgf6WR6dAekv7gZXPfKTEvbnk7FT+mn8UYFbQnQ=";
|
||||
hash = "sha256-utaQhUBpFUpxqE+cEJqlQHyJXSo/4UzrA2uqUd88uaM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RuIn4JNt4c47p2uiLtmCVYyY0/K1kJpmUboXHA5vhew=";
|
||||
vendorHash = "sha256-3fUvl772pscrQv2wJkRX5wBhAt9fmfIPI7FGq7h7Fqw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
gnome,
|
||||
grilo,
|
||||
grilo-plugins,
|
||||
libepoxy,
|
||||
libpeas,
|
||||
libportal-gtk3,
|
||||
libhandy,
|
||||
@@ -32,11 +33,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "totem";
|
||||
version = "43.1";
|
||||
version = "43.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz";
|
||||
hash = "sha256-VmgpHpxkRJhcs//k6k8CEvVMK75g3QERTBqVD5R1nm0=";
|
||||
hash = "sha256-CwB9MPu5O5WmBPFISKSX9X/DM6dcLmOKJJly6ZwB5qQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gst-libav
|
||||
libepoxy
|
||||
libpeas
|
||||
libportal-gtk3
|
||||
libhandy
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
pname = "trezor-suite";
|
||||
version = "25.6.2";
|
||||
version = "25.6.3";
|
||||
|
||||
suffix =
|
||||
{
|
||||
@@ -24,8 +24,8 @@ let
|
||||
hash =
|
||||
{
|
||||
# curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-0As+Hh8fMwTaxMwe1KjBwcDfireKjc+hgDtHfefRTKIVlF5FNb3fuVLN3aaZACuo0J+Hwd0KIaoacRAlV6EOsw==";
|
||||
x86_64-linux = "sha512-vOrOOJsvYkrDpYd2E9ojbmL3PSKMpnYG+oznVUUS4dKfvmSP2sb5eXUjP6k6fYlDER2q/7YfXBnVycPqHLXm2Q==";
|
||||
aarch64-linux = "sha512-uOfunT0I/Yt07r0J6/OFYN17N0V41oIJZqieineFVJW0Q+pLQc7Bvme4lfwa1l/gF9ciwwStEJRo3uuWDehFaw==";
|
||||
x86_64-linux = "sha512-OkLee1qCM9jCZiiBOwYwiN0BasGa/OUHqJ4b4qMmr3u69EbchI5rvS3XfZ5GhkCI+9x32CAjUvRxlflAenC8RQ==";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.7.16";
|
||||
version = "0.7.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-E9tFjJwV+zDOxsFdDeX6D8DqD0zFNW8kryeY9FmA63U=";
|
||||
hash = "sha256-XZ0wlnj76iWgK6jvckI+bSo75PFKAbqUm6jLBKt9+ys=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Eg4YVqKxjYEPS67qnc0y1Tuy6HAFEy6rCjr7/ZXF3yE=";
|
||||
cargoHash = "sha256-imcz/qzq2p9mwDjaqVzIvz7QY0Hte/WSBNNcLa5Njv0=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = "1.20.11";
|
||||
version = "1.20.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
|
||||
hash = "sha256-IOreg6j/jLhOK8jm2AgSnYQrql5R6QxsshvPs8OUcQA=";
|
||||
hash = "sha256-h6YXEZoVVV9IuKkgtK9Z3NTvJogVNHmXdAcKxwfvqcE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [ dotnet-runtime_7 ];
|
||||
|
||||
runtimeLibs = lib.makeLibraryPath (
|
||||
[
|
||||
gtk2
|
||||
@@ -77,30 +75,35 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup =
|
||||
''
|
||||
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||
--add-flags $out/share/vintagestory/Vintagestory.dll
|
||||
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||
--add-flags $out/share/vintagestory/VintagestoryServer.dll
|
||||
''
|
||||
+ ''
|
||||
find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
|
||||
local filename="$(basename -- "$file")"
|
||||
ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
|
||||
done
|
||||
'';
|
||||
preFixup = ''
|
||||
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||
--set-default mesa_glthread true \
|
||||
--add-flags $out/share/vintagestory/Vintagestory.dll
|
||||
|
||||
meta = with lib; {
|
||||
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||
--set-default mesa_glthread true \
|
||||
--add-flags $out/share/vintagestory/VintagestoryServer.dll
|
||||
|
||||
find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
|
||||
local filename="$(basename -- "$file")"
|
||||
ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "In-development indie sandbox game about innovation and exploration";
|
||||
homepage = "https://www.vintagestory.at/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
artturin
|
||||
gigglesquid
|
||||
niraethm
|
||||
dtomvan
|
||||
];
|
||||
mainProgram = "vintagestory";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
libX11,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
unstableGitUpdater,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
wayland-scanner,
|
||||
wayland,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "vulkan-hdr-layer-kwin6";
|
||||
version = "0-unstable-2025-05-22";
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
cmake
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
libX11
|
||||
wayland
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zamundaaa";
|
||||
repo = "VK_hdr_layer";
|
||||
rev = "1384036ea24a9bc38a5c684dac5122d5e3431ae6";
|
||||
hash = "sha256-xm0S1vLE8MAov8gf6rN5ZKZAe6NMKfHDlUlmNd332qw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Vulkan Wayland HDR WSI Layer (Xaver Hugl's fork for KWin 6)";
|
||||
homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ d4rk ];
|
||||
};
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
bash,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
catch2_3,
|
||||
@@ -89,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
popd
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "waybar-default-icon.patch";
|
||||
url = "https://github.com/Alexays/Waybar/commit/c336bc5466c858ac41dc9afd84f04a5ffec9e292.patch";
|
||||
hash = "sha256-RRGy/aeFX95fW0pT6mXhww2RdEtoOnaT3+dc7iB3bAY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
meson
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
buildPackages,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
gettext,
|
||||
pkg-config,
|
||||
@@ -17,27 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfsprogs";
|
||||
version = "6.13.0";
|
||||
version = "6.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-BFmTP5PZTIK8J4nnvWN0InPZ10IHza5n3DAyA42ggzc=";
|
||||
hash = "sha256-E7kfdL7vitERN/fZ1xBVVz2R6WG8VbsCRZVvabhM1wQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
name = "icu76.patch";
|
||||
url = "https://lore.kernel.org/linux-xfs/20250212081649.3502717-1-hi@alyssa.is/raw";
|
||||
hash = "sha256-Z7BW0B+/5eHWXdHre++wRtdbU/P6XZqudYx6EK5msIU=";
|
||||
})
|
||||
# Backport which fixes pkgsCross.armv7l-hf-multiplatform.xfsprogs
|
||||
(fetchpatch {
|
||||
name = "32-bit.patch";
|
||||
url = "https://web.git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/patch/mkfs/proto.c?id=a5466cee9874412cfdd187f07c5276e1d4ef0fea";
|
||||
hash = "sha256-svC7pSbblWfO5Khots2kWWfDMBXUrU35fk5wsdYuPQI=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
"dev"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emscripten";
|
||||
version = "4.0.8";
|
||||
version = "4.0.10";
|
||||
|
||||
llvmEnv = symlinkJoin {
|
||||
name = "emscripten-llvm-${version}";
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
name = "emscripten-node-modules-${version}";
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-fGlBtXsYOQ5V4/PRPPIpL3nxb+hUAuj9q7Jw0kL7ph0=";
|
||||
npmDepsHash = "sha256-kObMqg7hyy7E3F+wbdZoeDy5GOgpE2iNTuDVkFvq5ig=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "emscripten-core";
|
||||
repo = "emscripten";
|
||||
hash = "sha256-xiqi3SMmlfV7NaA61QZAW7BFHu9xOVN9QMWwwDInBeE=";
|
||||
hash = "sha256-b+7NYKRm0IsZ2cK2Vqz8zKhqYlxjlhVSdpdFq0LaUPU=";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
@@ -61,17 +61,6 @@ stdenv.mkDerivation rec {
|
||||
(replaceVars ./0001-emulate-clang-sysroot-include-logic.patch {
|
||||
resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/";
|
||||
})
|
||||
# The following patches work around a bug where EM_CACHE is not copied with
|
||||
# the correct permissions; the bug will be fixed in the next release (probably 4.0.10).
|
||||
# See also: https://github.com/emscripten-core/emscripten/issues/24404
|
||||
(fetchpatch {
|
||||
url = "https://github.com/emscripten-core/emscripten/commit/99c6e41154f701e423074e33a4fdaf5eea49d073.patch";
|
||||
hash = "sha256-/wkhz08NhbgxsrXd7YFfdCGX6LrS2Ncct8dcwxBMsjY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/emscripten-core/emscripten/commit/f4d358d740a238b67a1d6935e71638519d25afa0.patch";
|
||||
hash = "sha256-hib5ZAN/R2dH+rTv3nYF37+xKZmeboKxnS+5mkht2lM=";
|
||||
})
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://quotient-im.github.io/libQuotient/";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [
|
||||
colemickens
|
||||
matthiasbeyer
|
||||
];
|
||||
};
|
||||
|
||||
@@ -23,7 +23,7 @@ let
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz";
|
||||
url = "mirror://openbsd/LibreSSL/libressl-${version}.tar.gz";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
@@ -38,6 +38,8 @@ let
|
||||
"-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK"
|
||||
# libressl will append this to the regular prefix for libdir
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
|
||||
"-DTLS_DEFAULT_CA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
] ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
# The autoconf build is broken as of 2.9.1, resulting in the following error:
|
||||
@@ -47,19 +49,14 @@ let
|
||||
preConfigure = ''
|
||||
rm configure
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'exec_prefix \''${prefix}' "exec_prefix ${placeholder "bin"}" \
|
||||
--replace 'libdir \''${exec_prefix}' 'libdir \''${prefix}'
|
||||
--replace-fail 'exec_prefix \''${prefix}' "exec_prefix ${placeholder "bin"}" \
|
||||
--replace-fail 'libdir \''${exec_prefix}' 'libdir \''${prefix}'
|
||||
'';
|
||||
|
||||
inherit patches;
|
||||
|
||||
# Since 2.9.x the default location can't be configured from the build using
|
||||
# DEFAULT_CA_FILE anymore, instead we have to patch the default value.
|
||||
postPatch = ''
|
||||
patchShebangs tests/
|
||||
${lib.optionalString (lib.versionAtLeast version "2.9.2") ''
|
||||
substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"'
|
||||
''}
|
||||
'';
|
||||
|
||||
doCheck = !(stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isRiscV);
|
||||
@@ -116,47 +113,8 @@ let
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
libressl_3_6 = generic {
|
||||
version = "3.6.3";
|
||||
hash = "sha256-h7G7426e7I0K5fBMg9NrLFsOWBeEx+sIFwJe0p6t6jc=";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libressl/portable/commit/86e4965d7f20c3a6afc41d95590c9f6abb4fe788.patch";
|
||||
includes = [ "tests/tlstest.sh" ];
|
||||
hash = "sha256-XmmKTvP6+QaWxyGFCX6/gDfME9GqBWSx4X8RH8QbDXA=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
libressl_3_7 = generic {
|
||||
version = "3.7.3";
|
||||
hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM=";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libressl/portable/commit/86e4965d7f20c3a6afc41d95590c9f6abb4fe788.patch";
|
||||
includes = [ "tests/tlstest.sh" ];
|
||||
hash = "sha256-XmmKTvP6+QaWxyGFCX6/gDfME9GqBWSx4X8RH8QbDXA=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
libressl_3_8 = generic {
|
||||
version = "3.8.4";
|
||||
hash = "sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0=";
|
||||
|
||||
patches = [
|
||||
# Fixes build on ppc64
|
||||
# https://github.com/libressl/portable/pull/1073
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch";
|
||||
hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
libressl_3_9 = generic {
|
||||
version = "3.9.2";
|
||||
hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c=";
|
||||
|
||||
@@ -77,6 +77,12 @@ buildPythonPackage rec {
|
||||
# user agent not available in nixpkgs
|
||||
"test_user_agent"
|
||||
"test_user_agent_with_custom_user_agent"
|
||||
|
||||
# Fail under nixpkgs-review in the sandbox due to "missing tables"
|
||||
"test_get_columns"
|
||||
"test_get_foreign_keys"
|
||||
"test_get_check_constraints"
|
||||
"test_get_unique_constraints"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "duckdb_engine" ];
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
bumpfontversion,
|
||||
coreutils,
|
||||
diffenator2,
|
||||
ffmpeg-python,
|
||||
font-v,
|
||||
fontbakery,
|
||||
fontfeatures,
|
||||
@@ -61,14 +62,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "gftools";
|
||||
version = "0.9.85";
|
||||
version = "0.9.86";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "gftools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-D7s4msdJFiBlIvREiOqLACDwciNi9Di0dRB+qLpfhFY=";
|
||||
hash = "sha256-4N27R+rbPSnxg701OGtrD7/iwTaUBdhp528+9n4ZIt8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -91,7 +92,7 @@ buildPythonPackage rec {
|
||||
|
||||
substituteInPlace \
|
||||
Lib/gftools/builder/operations/autohintOTF.py \
|
||||
--replace-fail '"otfautohint' '"${lib.getExe' afdko "otfautohint"}'
|
||||
--replace-fail 'otfautohint' '${lib.getExe' afdko "otfautohint"}'
|
||||
|
||||
substituteInPlace \
|
||||
Lib/gftools/builder/operations/paintcompiler.py \
|
||||
@@ -106,7 +107,7 @@ buildPythonPackage rec {
|
||||
--replace-fail '"cp' '"${lib.getExe' coreutils "cp"}'
|
||||
|
||||
substituteInPlace \
|
||||
Lib/gftools/builder/operations/{fix,remap,autohint,buildStat,addSubset,remapLayout,buildVTT}.py \
|
||||
Lib/gftools/builder/operations/{fix,remap,autohint,buildStat,addSubset,remapLayout,buildVTT,buildAvar2}.py \
|
||||
--replace-fail '"gftools' '"${placeholder "out"}/bin/gftools'
|
||||
|
||||
substituteInPlace \
|
||||
@@ -135,6 +136,7 @@ buildPythonPackage rec {
|
||||
beautifulsoup4
|
||||
brotli
|
||||
bumpfontversion
|
||||
ffmpeg-python
|
||||
font-v
|
||||
fontfeatures
|
||||
fontmake
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipylab";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
# This needs to be fetched from Pypi, as we rely on the nodejs build to be skipped,
|
||||
# which only happens if ipylab/labextension/style.js is present.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xPB0Sx+W1sRgW5hqpZ68zWRFG/cclIOgGat6UsVlYXA=";
|
||||
hash = "sha256-85hYpNnvbsuC+O/uufa1oBo6ZNTzxPKl/i1YrllN4hI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-ruff";
|
||||
version = "0.4.1";
|
||||
version = "0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "businho";
|
||||
repo = "pytest-ruff";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ol+W5mDGMCwptuBa0b+Plkm64UUBf9bmr9YBo8g93Ok=";
|
||||
hash = "sha256-fwtubbTRvPMSGhylP3H5zhIwHdeWeTbvxZY5doM+tvw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "A pytest plugin to run ruff";
|
||||
homepage = "https://github.com/businho/pytest-ruff";
|
||||
changelog = "https://github.com/businho/pytest-ruff/releases/tag/v${version}";
|
||||
changelog = "https://github.com/businho/pytest-ruff/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ baloo ];
|
||||
};
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
let
|
||||
pname = "pgadmin";
|
||||
version = "9.3";
|
||||
yarnHash = "sha256-T6RKWuAAoJgbzJKef4ioOoUDtoGM9s9BFqxFdy5EtyQ=";
|
||||
version = "9.4";
|
||||
yarnHash = "sha256-AlAyHtadjmKZb0rHNIlaPtEcGFQ15Fc6rExMsNFGwDc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgadmin-org";
|
||||
repo = "pgadmin4";
|
||||
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
|
||||
hash = "sha256-4uupF1dw6OE/briAI5PWiQ7h6RPx1sUqf8PB8cJsNSU=";
|
||||
hash = "sha256-oslp9g63mYeP9CmpCzF80nlyqF1ftGbMRIsp6goJOx4=";
|
||||
};
|
||||
|
||||
mozjpeg-bin = fetchFromGitHub {
|
||||
@@ -247,7 +247,6 @@ pythonPackages.buildPythonApplication rec {
|
||||
azure-identity
|
||||
sphinxcontrib-youtube
|
||||
dnspython
|
||||
speaklater3
|
||||
google-auth-oauthlib
|
||||
google-api-python-client
|
||||
keyring
|
||||
|
||||
@@ -41,6 +41,7 @@ pushd $TMPDIR
|
||||
wget -c $url
|
||||
tar -xzf "pgadmin4-$newest_version.tar.gz"
|
||||
cd "pgadmin4-$newest_version/web"
|
||||
patch -u yarn.lock ${scriptDir}/mozjpeg.patch
|
||||
|
||||
printf "Will now generate the hash. This will download the packages to the nix store and also take some time\n"
|
||||
yarn-berry-fetcher missing-hashes yarn.lock
|
||||
|
||||
@@ -2089,6 +2089,7 @@ mapAliases {
|
||||
void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
|
||||
volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
|
||||
vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
|
||||
vulkan-hdr-layer-kwin6 = throw "'vulkan-hdr-layer-kwin6' was removed as it is unnecessary since Mesa 25.1"; # Added 2025-06-30
|
||||
vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
|
||||
inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
|
||||
|
||||
|
||||
@@ -9146,9 +9146,6 @@ with pkgs;
|
||||
zunclient = with python313Packages; toPythonApplication python-zunclient;
|
||||
|
||||
inherit (callPackages ../development/libraries/libressl { })
|
||||
libressl_3_6
|
||||
libressl_3_7
|
||||
libressl_3_8
|
||||
libressl_3_9
|
||||
libressl_4_0
|
||||
;
|
||||
@@ -14266,7 +14263,7 @@ with pkgs;
|
||||
|
||||
webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_36; };
|
||||
|
||||
webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_34; };
|
||||
webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_36; };
|
||||
|
||||
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {
|
||||
stdenv = if stdenv.cc.isClang then gccStdenv else stdenv;
|
||||
|
||||
@@ -120,6 +120,7 @@ let
|
||||
cupy = linux;
|
||||
faiss = linux;
|
||||
faster-whisper = linux;
|
||||
flashinfer = linux;
|
||||
flax = linux;
|
||||
gpt-2-simple = linux;
|
||||
grad-cam = linux;
|
||||
|
||||
Reference in New Issue
Block a user