Merge master into staging-next
This commit is contained in:
@@ -12076,6 +12076,11 @@
|
||||
githubId = 1198065;
|
||||
name = "Jeffrey David Johnson";
|
||||
};
|
||||
jeffcshelton = {
|
||||
github = "jeffcshelton";
|
||||
githubId = 77426854;
|
||||
name = "Jeff Shelton";
|
||||
};
|
||||
jefferyoo = {
|
||||
email = "oojefferywm@proton.me";
|
||||
github = "jefferyoo";
|
||||
@@ -21556,6 +21561,12 @@
|
||||
githubId = 12017109;
|
||||
name = "Rabindra Dhakal";
|
||||
};
|
||||
qb114514 = {
|
||||
name = "qb114514";
|
||||
email = "GNUqb114514@outlook.com";
|
||||
github = "GNUqb114514";
|
||||
githubId = 110373832;
|
||||
};
|
||||
qbisi = {
|
||||
name = "qbisicwate";
|
||||
email = "qbisicwate@gmail.com";
|
||||
|
||||
@@ -60,7 +60,7 @@ in
|
||||
description = "Whether to start the web-ui. This is the preferred way of configuring things such as the steam guard token.";
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs [ "ArchiSteamFarm" "ui" ] {
|
||||
package = lib.mkPackageOption pkgs [ "archisteamfarm" "ui" ] {
|
||||
extraDescription = ''
|
||||
::: {.note}
|
||||
Contents must be in lib/dist
|
||||
@@ -78,7 +78,7 @@ in
|
||||
description = "The Web-UI hosted on 127.0.0.1:1242.";
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "ArchiSteamFarm" {
|
||||
package = lib.mkPackageOption pkgs "archisteamfarm" {
|
||||
extraDescription = ''
|
||||
::: {.warning}
|
||||
Should always be the latest version, for security reasons,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.wmii;
|
||||
wmii = pkgs.wmii_hg;
|
||||
wmii = pkgs.wmii;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
# Xen Project Hypervisor (Dom0) support.
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
@@ -8,35 +6,40 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (builtins) readFile;
|
||||
inherit (lib.meta) hiPrio;
|
||||
inherit (lib.modules) mkRemovedOptionModule mkRenamedOptionModule mkIf;
|
||||
inherit (lib.options)
|
||||
mkOption
|
||||
mkEnableOption
|
||||
inherit (lib)
|
||||
boolToString
|
||||
getExe
|
||||
hasSuffix
|
||||
hiPrio
|
||||
literalExpression
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkOption
|
||||
mkPackageOption
|
||||
mkRemovedOptionModule
|
||||
mkRenamedOptionModule
|
||||
optional
|
||||
optionalAttrs
|
||||
optionalString
|
||||
optionals
|
||||
singleton
|
||||
teams
|
||||
types
|
||||
;
|
||||
inherit (lib.types)
|
||||
listOf
|
||||
str
|
||||
inherit (types)
|
||||
addCheck
|
||||
bool
|
||||
enum
|
||||
float
|
||||
int
|
||||
ints
|
||||
lines
|
||||
enum
|
||||
path
|
||||
submodule
|
||||
addCheck
|
||||
float
|
||||
bool
|
||||
int
|
||||
listOf
|
||||
nullOr
|
||||
path
|
||||
str
|
||||
submodule
|
||||
;
|
||||
inherit (lib.lists) optional optionals;
|
||||
inherit (lib.strings) hasSuffix optionalString;
|
||||
inherit (lib.meta) getExe;
|
||||
inherit (lib.attrsets) optionalAttrs;
|
||||
inherit (lib.trivial) boolToString;
|
||||
inherit (lib.teams.xen) members;
|
||||
|
||||
cfg = config.virtualisation.xen;
|
||||
|
||||
@@ -59,14 +62,12 @@ let
|
||||
diffutils
|
||||
]
|
||||
);
|
||||
runtimeEnv = {
|
||||
efiMountPoint = config.boot.loader.efi.efiSysMountPoint;
|
||||
};
|
||||
runtimeEnv.efiMountPoint = config.boot.loader.efi.efiSysMountPoint;
|
||||
|
||||
# We disable SC2016 because we don't want to expand the regexes in the sed commands.
|
||||
excludeShellChecks = [ "SC2016" ];
|
||||
|
||||
text = readFile ./xen-boot-builder.sh;
|
||||
text = builtins.readFile ./xen-boot-builder.sh;
|
||||
};
|
||||
in
|
||||
|
||||
@@ -224,7 +225,7 @@ in
|
||||
boot = {
|
||||
params = mkOption {
|
||||
default = [ ];
|
||||
example = ''
|
||||
example = literalExpression ''
|
||||
[
|
||||
"iommu=force:true,qinval:true,debug:true"
|
||||
"noreboot=true"
|
||||
@@ -234,8 +235,11 @@ in
|
||||
type = listOf str;
|
||||
description = ''
|
||||
Xen Command Line parameters passed to Domain 0 at boot time.
|
||||
Note: these are different from `boot.kernelParams`. See
|
||||
|
||||
::: {.note}
|
||||
Note: these are different from {option}`boot.kernelParams`. See
|
||||
the [Xen documentation](https://xenbits.xenproject.org/docs/unstable/misc/xen-command-line.html) for more information.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
builderVerbosity = mkOption {
|
||||
@@ -267,7 +271,7 @@ in
|
||||
type = path;
|
||||
default = "${cfg.package.boot}/${cfg.package.multiboot}";
|
||||
defaultText = literalExpression "\${config.virtualisation.xen.package.boot}/\${config.virtualisation.xen.package.multiboot}";
|
||||
example = literalExpression "\${config.virtualisation.xen.package}/boot/xen-\${config.virtualisation.xen.package.version}";
|
||||
example = literalExpression "\${config.virtualisation.xen.package}/boot/xen-\${config.virtualisation.xen.package.upstreamVersion}";
|
||||
description = ''
|
||||
Path to the Xen `multiboot` binary used for BIOS booting.
|
||||
Unless you're building your own Xen derivation, you should leave this
|
||||
@@ -280,7 +284,7 @@ in
|
||||
type = path;
|
||||
default = "${cfg.package.boot}/${cfg.package.efi}";
|
||||
defaultText = literalExpression "\${config.virtualisation.xen.package.boot}/\${config.virtualisation.xen.package.efi}";
|
||||
example = literalExpression "\${config.virtualisation.xen.package}/boot/efi/efi/nixos/xen-\${config.virtualisation.xen.package.version}.efi";
|
||||
example = literalExpression "\${config.virtualisation.xen.package}/boot/efi/efi/nixos/xen-\${config.virtualisation.xen.package.upstreamVersion}.efi";
|
||||
description = ''
|
||||
Path to xen.efi. `pkgs.xen` is patched to install the xen.efi file
|
||||
on `$boot/boot/xen.efi`, but an unpatched Xen build may install it
|
||||
@@ -333,7 +337,7 @@ in
|
||||
extraConfig = mkOption {
|
||||
type = lines;
|
||||
default = "";
|
||||
example = ''
|
||||
example = literalExpression ''
|
||||
XENDOMAINS_SAVE=/persist/xen/save
|
||||
XENDOMAINS_RESTORE=false
|
||||
XENDOMAINS_CREATE_USLEEP=10000000
|
||||
@@ -674,12 +678,15 @@ in
|
||||
}
|
||||
{
|
||||
assertion = config.boot.initrd.systemd.enable;
|
||||
message = "Xen does not support the legacy script-based Stage 1 initrd.";
|
||||
message = ''
|
||||
Xen does not support the legacy script-based stage 1 initial ramdisk.
|
||||
Please set 'boot.initrd.systemd.enable' to 'true'.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.dom0Resources.maxMemory >= cfg.dom0Resources.memory;
|
||||
message = ''
|
||||
You have allocated more memory to dom0 than virtualisation.xen.dom0Resources.maxMemory
|
||||
You have allocated more memory to dom0 than 'virtualisation.xen.dom0Resources.maxMemory'
|
||||
allows for. Please increase the maximum memory limit, or decrease the default memory allocation.
|
||||
'';
|
||||
}
|
||||
@@ -690,12 +697,19 @@ in
|
||||
{
|
||||
assertion = cfg.store.settings.quota.maxWatchEvents >= cfg.store.settings.quota.maxOutstanding;
|
||||
message = ''
|
||||
Upstream Xen recommends that maxWatchEvents be equal to or greater than maxOutstanding,
|
||||
Upstream Xen recommends that 'virtualisation.xen.store.settings.quota.maxWatchEvents'
|
||||
be equal to or greater than 'virtualisation.xen.store.settings.quota.maxOutstanding',
|
||||
in order to mitigate denial of service attacks from malicious frontends.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
warnings = lib.optional ((config.boot ? lanzaboote) && config.boot.lanzaboote.enable) ''
|
||||
Xen support has not yet been merged into Lanzaboote.
|
||||
Ensure that your Lanzaboote configuration includes PR #387:
|
||||
https://github.com/nix-community/lanzaboote/pull/387
|
||||
'';
|
||||
|
||||
virtualisation.xen.boot.params =
|
||||
optionals cfg.trace [
|
||||
"loglvl=all"
|
||||
@@ -752,9 +766,7 @@ in
|
||||
};
|
||||
|
||||
# See the `xenBootBuilder` script in the main `let...in` statement of this file.
|
||||
loader.systemd-boot.extraInstallCommands = ''
|
||||
${getExe xenBootBuilder} ${cfg.boot.builderVerbosity}
|
||||
'';
|
||||
loader.systemd-boot.extraInstallCommands = "${getExe xenBootBuilder} ${cfg.boot.builderVerbosity}";
|
||||
};
|
||||
|
||||
# Domain 0 requires a pvops-enabled kernel.
|
||||
@@ -854,21 +866,18 @@ in
|
||||
# Xen provides systemd units.
|
||||
packages = [ cfg.package ];
|
||||
|
||||
mounts = [
|
||||
{
|
||||
description = "Mount /proc/xen files";
|
||||
what = "xenfs";
|
||||
where = "/proc/xen";
|
||||
type = "xenfs";
|
||||
unitConfig = {
|
||||
ConditionPathExists = "/proc/xen";
|
||||
RefuseManualStop = "true";
|
||||
};
|
||||
}
|
||||
];
|
||||
mounts = singleton {
|
||||
description = "Mount /proc/xen files";
|
||||
what = "xenfs";
|
||||
where = "/proc/xen";
|
||||
type = "xenfs";
|
||||
unitConfig = {
|
||||
ConditionPathExists = "/proc/xen";
|
||||
RefuseManualStop = "true";
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
|
||||
# While this service is installed by the `xen` package, it shouldn't be used in dom0.
|
||||
xendriverdomain.enable = false;
|
||||
|
||||
@@ -926,5 +935,5 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
meta.maintainers = members;
|
||||
meta.maintainers = teams.xen.members;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
{
|
||||
name = "earlyoom";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
ncfavier
|
||||
oxalica
|
||||
];
|
||||
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
mktplcRef = {
|
||||
name = "amazon-q-vscode";
|
||||
publisher = "AmazonWebServices";
|
||||
version = "1.108.0";
|
||||
hash = "sha256-cJ6Qi/ut4MgGuTBU9/Gw051i3VvPC+lvxgPGxJzzZ5c=";
|
||||
version = "1.109.0";
|
||||
hash = "sha256-y7iUWFKYTLZVS9Zjoy9NtqtgfQTJLWij9JD20pjyTXY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "flycast";
|
||||
version = "0-unstable-2026-01-19";
|
||||
version = "0-unstable-2026-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "f86e195017fb1595c2622bca3c95e88198194784";
|
||||
hash = "sha256-Cd3vFpB66Bymv/Zjzd4XO3qJn5vaSnkWV1i5IxtaXXc=";
|
||||
rev = "21eb24f86d785b1c631161f03057b22c160182c0";
|
||||
hash = "sha256-gGjSbkhy6ykEin8Bci6xHNII2MdEzLcUPr/dU6IwlIw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "datovka";
|
||||
version = "4.26.0";
|
||||
version = "4.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
|
||||
sha256 = "sha256-pEdjh/c4vhirj2R9bYDdi2FL7N9x67kTOyfXiJDzMKE=";
|
||||
sha256 = "sha256-vTfmJEwbfaPFnZE8o3YnZhjwfMZ0At7eZ0iMoh4/HQE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
# poco 1.14 requires c++17
|
||||
NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu++17" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -243,19 +243,29 @@ stdenv.mkDerivation {
|
||||
echo CONFIG_MPEGAUDIODSP=yes >> config.mak
|
||||
'';
|
||||
|
||||
# Fixes compilation with newer versions of clang that make these warnings errors by default.
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion -Wno-incompatible-function-pointer-types";
|
||||
|
||||
NIX_LDFLAGS = toString (
|
||||
lib.optional fontconfigSupport "-lfontconfig"
|
||||
++ lib.optional fribidiSupport "-lfribidi"
|
||||
++ lib.optionals x11Support [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
]
|
||||
++ lib.optional x264Support "-lx264"
|
||||
++ [ "-lfreetype" ]
|
||||
);
|
||||
env =
|
||||
lib.optionalAttrs stdenv.cc.isClang {
|
||||
# Fixes compilation with newer versions of clang that make these warnings errors by default.
|
||||
NIX_CFLAGS_COMPILE = "-Wno-int-conversion -Wno-incompatible-function-pointer-types";
|
||||
}
|
||||
// {
|
||||
NIX_LDFLAGS = toString (
|
||||
lib.optionals fontconfigSupport [
|
||||
"-lfontconfig"
|
||||
]
|
||||
++ lib.optionals fribidiSupport [
|
||||
"-lfribidi"
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
]
|
||||
++ lib.optionals x264Support [
|
||||
"-lx264"
|
||||
]
|
||||
++ [ "-lfreetype" ]
|
||||
);
|
||||
};
|
||||
|
||||
installTargets = [ "install" ] ++ lib.optional x11Support "install-gui";
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "4ti2";
|
||||
version = "1.6.13";
|
||||
version = "1.6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "4ti2";
|
||||
repo = "4ti2";
|
||||
rev = "Release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-gbYG55LfVhjJJFJu0L8AWIAnFDViHIW2N1qtS8xOFAc=";
|
||||
tag = "Release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-bFvq90hLLGty7p6NLxOARVvKdizg3bp2NkP9nZpVFzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ab-av1";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexheretic";
|
||||
repo = "ab-av1";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HSWu3gHpgCUkmr63mAi2Hd67Rap5vDZ/oHRh6O7y6uA=";
|
||||
hash = "sha256-EPQUm51H/yY0O1x6QAx1a+VeCgTYoJ19BAcEY52Oduo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jzEwblYsA7tgoJE6HhdtdDyOS50DyL87/J/T+cNKB3M=";
|
||||
cargoHash = "sha256-uGvEWQUIRqb0Xpwywh3M26cKtuzm59uvH9bjZlvMPEk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--x-libraries=${lib.getLib libX11}/lib"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
|
||||
|
||||
# libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o
|
||||
# libtool: error: cannot find the library 'libexamples.la'
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-DkfpMK0T67B4mnriignf4hx6Ifddls0rN0SxyfEsPZg=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=\${out}"
|
||||
|
||||
Generated
+3
-2
@@ -19,7 +19,7 @@ let
|
||||
];
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "ArchiSteamFarm";
|
||||
pname = "archisteamfarm";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "6.3.1.6";
|
||||
|
||||
@@ -42,6 +42,7 @@ buildDotnetModule rec {
|
||||
testProjectFile = "ArchiSteamFarm.Tests";
|
||||
|
||||
executable = "ArchiSteamFarm";
|
||||
installPath = "${placeholder "out"}/lib/ArchiSteamFarm";
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
@@ -95,7 +96,7 @@ buildDotnetModule rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package ArchiSteamFarm
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package archisteamfarm
|
||||
updateScript = ./update.sh;
|
||||
ui = callPackage ./web-ui { };
|
||||
};
|
||||
+3
-3
@@ -4,7 +4,7 @@ set -euo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')"
|
||||
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
||||
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
|
||||
|
||||
if [[ "$new_version" == "$old_version" ]]; then
|
||||
echo "Already up to date!"
|
||||
@@ -17,10 +17,10 @@ asf_path=$PWD
|
||||
cd ../../../..
|
||||
|
||||
if [[ "${1:-}" != "--deps-only" ]]; then
|
||||
update-source-version ArchiSteamFarm "$new_version"
|
||||
update-source-version archisteamfarm "$new_version"
|
||||
fi
|
||||
|
||||
$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link)
|
||||
$(nix-build -A archisteamfarm.fetch-deps --no-out-link)
|
||||
|
||||
cd "$asf_path/web-ui"
|
||||
./update.sh
|
||||
+2
-2
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
ArchiSteamFarm,
|
||||
archisteamfarm,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
@@ -33,6 +33,6 @@ buildNpmPackage rec {
|
||||
description = "Official web interface for ASF";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = "https://github.com/JustArchiNET/ASF-ui";
|
||||
inherit (ArchiSteamFarm.meta) maintainers platforms;
|
||||
inherit (archisteamfarm.meta) maintainers platforms;
|
||||
};
|
||||
}
|
||||
+2
-2
@@ -3,14 +3,14 @@
|
||||
set -eou pipefail
|
||||
|
||||
cd "$(dirname "$0")"/../../../../..
|
||||
version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r)
|
||||
version=$(nix-instantiate --strict --eval -A archisteamfarm.version | jq -r)
|
||||
cd -
|
||||
ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha)
|
||||
|
||||
curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json
|
||||
|
||||
cd -
|
||||
update-source-version ArchiSteamFarm.ui "$ui"
|
||||
update-source-version archisteamfarm.ui "$ui"
|
||||
cd -
|
||||
|
||||
npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ashuffle";
|
||||
version = "3.14.9";
|
||||
version = "3.14.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joshkunz";
|
||||
repo = "ashuffle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HQ4+vyTvX0mhfuRclbiC+MvllV3300ztAwL0IxrUiC8=";
|
||||
hash = "sha256-nvmyup9hW/kI7Wwo5+1/FEoHd4kfMvYbttI8nJkLfVE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "auto-cpufreq";
|
||||
version = "2.6.0";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdnanHodzic";
|
||||
repo = "auto-cpufreq";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=";
|
||||
hash = "sha256-X+2RxD4+F8LBqvJNRh6FduRLU4a2SnZQ8a9BCN6Ty1E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -136,23 +136,25 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
# The build system uses custom logic - defined in
|
||||
# cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
|
||||
# library, which doesn't pick up the package in the nix store. We
|
||||
# additionally need to set the path via the NLOPT environment variable.
|
||||
NLOPT = nlopt;
|
||||
env = {
|
||||
# The build system uses custom logic - defined in
|
||||
# cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
|
||||
# library, which doesn't pick up the package in the nix store. We
|
||||
# additionally need to set the path via the NLOPT environment variable.
|
||||
NLOPT = nlopt;
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-DBOOST_TIMER_ENABLE_DEPRECATED"
|
||||
# Disable compiler warnings that clutter the build log.
|
||||
# It seems to be a known issue for Eigen:
|
||||
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
|
||||
"-Wno-ignored-attributes"
|
||||
"-I${opencv}/include/opencv4"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-DBOOST_TIMER_ENABLE_DEPRECATED"
|
||||
# Disable compiler warnings that clutter the build log.
|
||||
# It seems to be a known issue for Eigen:
|
||||
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
|
||||
"-Wno-ignored-attributes"
|
||||
"-I${opencv}/include/opencv4"
|
||||
];
|
||||
|
||||
# prusa-slicer uses dlopen on `libudev.so` at runtime
|
||||
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev" + " -L${opencv}/lib -lopencv_imgcodecs";
|
||||
# prusa-slicer uses dlopen on `libudev.so` at runtime
|
||||
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev" + " -L${opencv}/lib -lopencv_imgcodecs";
|
||||
};
|
||||
|
||||
# TODO: macOS
|
||||
prePatch = ''
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
gtest,
|
||||
gmp,
|
||||
cadical,
|
||||
cadical' ? cadical.override { version = "2.1.3"; },
|
||||
cryptominisat,
|
||||
kissat,
|
||||
zlib,
|
||||
@@ -26,11 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwuzla";
|
||||
repo = "bitwuzla";
|
||||
rev = finalAttrs.version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-v5r+BWXUUbKtkos6qmGMC9MMytS/h759SHY6lsTHU1k=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
@@ -41,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cadical
|
||||
cadical'
|
||||
cryptominisat
|
||||
btor2tools
|
||||
symfpu
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "butt";
|
||||
version = "1.45.0";
|
||||
version = "1.46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-iEmFEJRsTvHeKGYvnhzYXSC/q0DSw0Z/YgK4buDtg2Q=";
|
||||
hash = "sha256-3RIC2H5HMn/e5Bl4XCPxxpv+FET9RgV7MxtcOuscXzs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,7 +16,7 @@ let
|
||||
"cli"
|
||||
"desktop"
|
||||
];
|
||||
version = "0.53.1";
|
||||
version = "0.55.1";
|
||||
|
||||
system = stdenv.hostPlatform.system;
|
||||
isLinux = stdenv.isLinux;
|
||||
@@ -26,19 +26,19 @@ let
|
||||
cliSources = {
|
||||
x86_64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-qSrgEg0iEx5Mpe+meHnkrOgM9zcQJBzoH5KlMy8FE5Q=";
|
||||
hash = "sha256-4xRkEN/ZA+JUFMB2qoEZT0Bzv2Qc7Y9kcj251MCAhKE=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-aarch64.tar.gz";
|
||||
hash = "sha256-mgIjo+1y2jxC7lPUkLjuwIq4F8SagjQAyfeqaoeQX9w=";
|
||||
hash = "sha256-gMQkF0+mq2nRBy0oBenFvp69byWCkqmt8E4ZpKuNxKw=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-x86_64.zip";
|
||||
hash = "sha256-iPDYQXWaxt32MxbAWL0496i7IO0FEt8di4E0msagfEo=";
|
||||
hash = "sha256-C+EfmSBJMyxYXLfzxCrY7ZVtg8nwtie8w0Lj1Dy7o/k=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-aarch64.zip";
|
||||
hash = "sha256-5b9TrR5ZqlN17OgIaQ9vPIccwOiELNcidjinF3rf6Zc=";
|
||||
hash = "sha256-b0cBS3RwsiLgJNqHWxi672MVZNfTYNOEJ2k0h2qNnP0=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -46,19 +46,19 @@ let
|
||||
desktopSources = {
|
||||
x86_64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-/puWhX5ooz994f1COw356HSfqcOmJaAweccTIWl9KCo=";
|
||||
hash = "sha256-zfts2h8QWTxe/dISwgKRQiSx2nD6vtE1atPfREyGX/U=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
|
||||
hash = "sha256-iYaWN6Nu0+zPSUzlhUS5EIuYO32BVkBLZrPA9h7DpfM=";
|
||||
hash = "sha256-fYqzukRptCB466LIPbVre2EwBFt4Bsq9amQ4kjQuV2Q=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
|
||||
hash = "sha256-iPDYQXWaxt32MxbAWL0496i7IO0FEt8di4E0msagfEo=";
|
||||
hash = "sha256-UsGT5n0MGVwWCXACo74Harb4J/qt/3TyD0+EFYNmPxw=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
|
||||
hash = "sha256-5b9TrR5ZqlN17OgIaQ9vPIccwOiELNcidjinF3rf6Zc=";
|
||||
hash = "sha256-iZHZayj2VYjMY9+p+xrlX+vP/DcbCRPQizQEqtF39EU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.17.3";
|
||||
version = "1.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8017nujJ/nHSy1xkzfObj30ffAsg7W2pbHzrto5ThH0=";
|
||||
hash = "sha256-X5zRAuBxey450bstp/AyaCQkMrqsFTcTD2xfpX3K/t0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NpnwtoTJs+xkedDEspDOQdZpIhuEhI3tRvH3hroIoIc=";
|
||||
cargoHash = "sha256-4B51DmJCv4dv5vKgJNFmjAGP4CDB1gdrbGrnqt/s2Lk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.72";
|
||||
version = "1.0.73";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-YkjRCP6VAp2Az0iM5HIG984ScJ3b3iKm34j4YuIs0kQ=";
|
||||
hash = "sha256-aYVo/mI4YoohwxXoIL9vpuPN526sPnQMV1PnUqJEO2U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SAO1VqlYzySIiBV3j6PCo7gknekmULpG/Two/8R0pv4=";
|
||||
cargoHash = "sha256-+TIYJn0BvFBmhVkldOTtAvQv5Uj5sLsJ4OGNH3ic8lU=";
|
||||
|
||||
meta = {
|
||||
description = "Graph the number of crates that depend on your crate over time";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "complgen";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DNmStSwuAFsLGC4pLU6dO2qhBQgxObPiUJxZoJf1d5A=";
|
||||
hash = "sha256-5fEownFj5cyLL+4ZPN80qlkw3xu6xspsKfruk7KBhrI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-whve1rNmqOLWjrM8gqxgocRTTWpEQ/VxT/0t+12uSKw=";
|
||||
cargoHash = "sha256-wGbf1UiCwjOzUbR0k45EAuGjEg9+x14d8kKpz7pHQN8=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
|
||||
@@ -3,13 +3,16 @@
|
||||
stdenvNoCC,
|
||||
cacert,
|
||||
yarn-berry,
|
||||
nodejs,
|
||||
nodejs-slim, # no need for NPM
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs-slim;
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "corepack";
|
||||
version = "0.34.6";
|
||||
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# force char to be unsigned on aarch64
|
||||
# https://codeberg.org/doug-moen/curv/issues/227
|
||||
NIX_CFLAGS_COMPILE = [ "-fsigned-char" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-fsigned-char" ];
|
||||
|
||||
# GPU tests do not work in sandbox, instead we do this for sanity
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
cmake,
|
||||
flex,
|
||||
cadical,
|
||||
cadical' ? cadical.override { version = "2.1.3"; },
|
||||
symfpu,
|
||||
gmp,
|
||||
python3,
|
||||
@@ -26,19 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
flex
|
||||
];
|
||||
buildInputs = [
|
||||
cadical.dev
|
||||
symfpu
|
||||
gmp
|
||||
gtest
|
||||
boost
|
||||
jdk
|
||||
libpoly
|
||||
(python3.withPackages (
|
||||
ps: with ps; [
|
||||
pyparsing
|
||||
@@ -46,6 +41,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
))
|
||||
];
|
||||
buildInputs = [
|
||||
cadical'.dev
|
||||
symfpu
|
||||
gmp
|
||||
gtest
|
||||
boost
|
||||
jdk
|
||||
libpoly
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./src/
|
||||
|
||||
@@ -45,8 +45,10 @@ stdenv.mkDerivation {
|
||||
flex
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
NIX_LDFLAGS = "-lbluetooth";
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
NIX_LDFLAGS = "-lbluetooth";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
# Some programs (for example, cabal-install) have problems with the double 0
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
# error by default in GCC 14
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105329
|
||||
NIX_CFLAGS_COMPILE = "-Wno-restrict -Wno-maybe-uninitialized";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-restrict -Wno-maybe-uninitialized";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_PERL5=OFF"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
themeName = "Dracula";
|
||||
version = "4.0.0-unstable-2026-01-22";
|
||||
version = "4.0.0-unstable-2026-01-31";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dracula-theme";
|
||||
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "gtk";
|
||||
rev = "0a573d38280bec3e576f4be9d12a716b02254f7a";
|
||||
hash = "sha256-Nyp6hLP8eAawiQMPuwZfg0FMR7HGDBb+TDozrE8VygQ=";
|
||||
rev = "1282a6806d568b736fddf783263fc96ccd34a8ce";
|
||||
hash = "sha256-6fYbe3CVfCw/CZaFX5Mc1DPb4+uiQLIZlirx+2/jUzw=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
||||
substituteInPlace create.make --replace-fail "-lcurses" "-lncurses"
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-DHAS_UNISTD=1 -DHAS_STDLIB=1 -DHAS_SYS_WAIT=1";
|
||||
env.NIX_CFLAGS_COMPILE = "-DHAS_UNISTD=1 -DHAS_STDLIB=1 -DHAS_SYS_WAIT=1";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
|
||||
patchShebangs ./
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "ELMER_INSTALL_LIB_DIR" "${placeholder "out"}/lib")
|
||||
|
||||
@@ -1,166 +0,0 @@
|
||||
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
|
||||
index f4bc16e..cae6562 100644
|
||||
--- a/src-tauri/Cargo.lock
|
||||
+++ b/src-tauri/Cargo.lock
|
||||
@@ -545,6 +545,17 @@ dependencies = [
|
||||
"brotli-decompressor",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "brotli"
|
||||
+version = "7.0.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
|
||||
+dependencies = [
|
||||
+ "alloc-no-stdlib",
|
||||
+ "alloc-stdlib",
|
||||
+ "brotli-decompressor",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "brotli-decompressor"
|
||||
version = "4.0.1"
|
||||
@@ -690,16 +701,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cargo_metadata"
|
||||
-version = "0.18.1"
|
||||
+version = "0.19.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
|
||||
+checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
|
||||
dependencies = [
|
||||
"camino",
|
||||
"cargo-platform",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde_json",
|
||||
- "thiserror 1.0.63",
|
||||
+ "thiserror 2.0.17",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2661,7 +2672,19 @@ version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
|
||||
dependencies = [
|
||||
- "jsonptr",
|
||||
+ "jsonptr 0.4.7",
|
||||
+ "serde",
|
||||
+ "serde_json",
|
||||
+ "thiserror 1.0.63",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "json-patch"
|
||||
+version = "3.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
|
||||
+dependencies = [
|
||||
+ "jsonptr 0.6.3",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 1.0.63",
|
||||
@@ -2678,6 +2701,16 @@ dependencies = [
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "jsonptr"
|
||||
+version = "0.6.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
|
||||
+dependencies = [
|
||||
+ "serde",
|
||||
+ "serde_json",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "keyboard-types"
|
||||
version = "0.7.0"
|
||||
@@ -4614,13 +4647,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
-version = "1.0.114"
|
||||
+version = "1.0.149"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
|
||||
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
|
||||
dependencies = [
|
||||
"itoa 1.0.10",
|
||||
- "ryu",
|
||||
+ "memchr",
|
||||
"serde",
|
||||
+ "serde_core",
|
||||
+ "zmij",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5237,7 +5272,7 @@ dependencies = [
|
||||
"dirs",
|
||||
"glob",
|
||||
"heck 0.5.0",
|
||||
- "json-patch",
|
||||
+ "json-patch 2.0.0",
|
||||
"schemars",
|
||||
"semver",
|
||||
"serde",
|
||||
@@ -5255,9 +5290,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
- "brotli",
|
||||
+ "brotli 6.0.0",
|
||||
"ico",
|
||||
- "json-patch",
|
||||
+ "json-patch 2.0.0",
|
||||
"plist",
|
||||
"png",
|
||||
"proc-macro2",
|
||||
@@ -5573,18 +5608,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tauri-utils"
|
||||
-version = "2.0.1"
|
||||
+version = "2.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
|
||||
+checksum = "96fb10e7cc97456b2d5b9c03e335b5de5da982039a303a20d10006885e4523a0"
|
||||
dependencies = [
|
||||
- "brotli",
|
||||
+ "brotli 7.0.0",
|
||||
"cargo_metadata",
|
||||
"ctor",
|
||||
"dunce",
|
||||
"glob",
|
||||
"html5ever",
|
||||
+ "http 1.1.0",
|
||||
"infer",
|
||||
- "json-patch",
|
||||
+ "json-patch 3.0.1",
|
||||
"kuchikiki",
|
||||
"log",
|
||||
"memchr",
|
||||
@@ -5599,7 +5635,7 @@ dependencies = [
|
||||
"serde_json",
|
||||
"serde_with",
|
||||
"swift-rs",
|
||||
- "thiserror 1.0.63",
|
||||
+ "thiserror 2.0.17",
|
||||
"toml 0.8.2",
|
||||
"url",
|
||||
"urlpattern",
|
||||
@@ -7031,6 +7067,12 @@ dependencies = [
|
||||
"zstd",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "zmij"
|
||||
+version = "1.0.12"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
|
||||
+
|
||||
[[package]]
|
||||
name = "zopfli"
|
||||
version = "0.8.1"
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "en-croissant";
|
||||
version = "0.12.2";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franciscoBSalgueiro";
|
||||
repo = "en-croissant";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ef6O8C1PPjCmF5lashpBQXWwjsEEKCl5R98QMOFDIBM=";
|
||||
hash = "sha256-+s774MtqbfOhL2qco+i9uBMQPn30EGvOYtqw1nZ9KkY=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -43,22 +43,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-p2j886NRBw/8c2UJ94o6w7YtKnOfm7hU9SgEUrzAwco=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-/gue4iQG8xySxsH3l5ri+GjmNr/9sow20CLVxxQo7Gs=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Bump the tauri-utils package to at least 2.1.0, to fix resource path resolution on NixOS.
|
||||
./en-croissant-update-tauri-utils.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
|
||||
'';
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
cargoHash = "sha256-cTb6nKHlazyOu3cpwAAp20j3QmrDxC507ZRpYT5fgQs=";
|
||||
cargoHash = "sha256-4gtGHexyR6TkI8tmtLMT2xUAn9+Bd9l3hRq43aL94yI=";
|
||||
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
# errors by default in GCC 14
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=return-mismatch -Wno-error=implicit-int";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=return-mismatch -Wno-error=implicit-int";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{bin,share/fairymax}
|
||||
|
||||
@@ -70,9 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -Dm644 $NIX_BUILD_TOP/$sourceRoot/util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (
|
||||
stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin
|
||||
) "-Wno-gnu-folding-constant";
|
||||
env = lib.optionalAttrs (stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin) {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-gnu-folding-constant";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.flashrom.org";
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "12.10.2",
|
||||
"version": "12.10.3",
|
||||
"sources": {
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.2/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "a6c0919ff1ba5099d7efcc595aa943ea26fb1614c9fdc8099dda5d7cdd2c902b"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "b2f62db7941f819375a9f8627bd55442c30310e93cb270621fdf9e5c707801e3"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.2/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "8014ec6416b70a6a762c9109aa70a28fc305c08711493691fb8b00a2f53bc910"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "fb866cd00da594c5c6435238e32ac2c13eaca40ead4936656aee88ea3446983f"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.2/floorp-macOS-universal.dmg",
|
||||
"sha256": "d225e9f6f1d81c6049905699ff08a64fb67496a16c31a2634af4c4f2e96f7a6d"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-macOS-universal.dmg",
|
||||
"sha256": "56477ebaae97aee37c0a93294f8770ae901bf2e35d2be03540daf0a779db6dae"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.2/floorp-macOS-universal.dmg",
|
||||
"sha256": "d225e9f6f1d81c6049905699ff08a64fb67496a16c31a2634af4c4f2e96f7a6d"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-macOS-universal.dmg",
|
||||
"sha256": "56477ebaae97aee37c0a93294f8770ae901bf2e35d2be03540daf0a779db6dae"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-DENABLE_LOCAL_ZOPFLI";
|
||||
env.NIX_CFLAGS_COMPILE = "-DENABLE_LOCAL_ZOPFLI";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitify";
|
||||
version = "6.16.0";
|
||||
version = "6.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitify-app";
|
||||
repo = "gitify";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yNgVcf7V1TPc6L5SaKhMulUlGJeBnqs/gZGeaz1AtW8=";
|
||||
hash = "sha256-A9LeitceqDGictQbB7OYOI/pggrW9u8A7TUMblK/LHM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-l61t3UKNAoBldquzXJPomrKDbiXXJMSdcsk43pQpcgc=";
|
||||
hash = "sha256-uK3CNyPewUVAmqBJq1WMCrNeMP5I18BEBkZIBP0qPsI=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gnmic";
|
||||
version = "0.42.1";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openconfig";
|
||||
repo = "gnmic";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mcgre0HmAR2L92HBlK8jdqlOqINI/NswgZUrSI//c8k=";
|
||||
hash = "sha256-+5f4SxAmpZrOmIr8MUR3ImmoPbzFQ0bh/4qnqkpfs1g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u4tLuD8CuS3BzWJHDpphtkjgB0zkzBpP3FWrRWNgyJM=";
|
||||
vendorHash = "sha256-zsb+Tky2yVyEUSKjvnS8YkRFMUf/01VIX2Vl6mB5mpw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -55,7 +55,15 @@ buildGoModule (finalAttrs: rec {
|
||||
]
|
||||
++ lib.optionals useLLD [ lld ];
|
||||
|
||||
env = lib.optionalAttrs useLLD { NIX_CFLAGS_LINK = "-fuse-ld=lld"; };
|
||||
env =
|
||||
lib.optionalAttrs useLLD {
|
||||
NIX_CFLAGS_LINK = "-fuse-ld=lld";
|
||||
}
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
|
||||
# uses go-systemd, which uses libsystemd headers
|
||||
# https://github.com/coreos/go-systemd/issues/351
|
||||
NIX_CFLAGS_COMPILE = "-I${lib.getDev systemd}/include";
|
||||
};
|
||||
|
||||
ldflags =
|
||||
let
|
||||
@@ -87,15 +95,11 @@ buildGoModule (finalAttrs: rec {
|
||||
"."
|
||||
];
|
||||
|
||||
# uses go-systemd, which uses libsystemd headers
|
||||
# https://github.com/coreos/go-systemd/issues/351
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"-I${lib.getDev systemd}/include"
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"-tags nonetwork" # disable network tests
|
||||
"-tags nodocker" # disable docker tests
|
||||
"-tags"
|
||||
"nonetwork" # disable network tests
|
||||
"-tags"
|
||||
"nodocker" # disable docker tests
|
||||
];
|
||||
|
||||
# go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "grasp-backend";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karlicoss";
|
||||
repo = "grasp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4eHY58ulvLGkKHfEishRlWPI52juxWP2zzUDwRmTM/k=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "grasp_backend" ];
|
||||
|
||||
# Tests do not seem possible to run with pytest:
|
||||
# RuntimeError: ("Couldn't determine path for ", PosixPath('/build/source/tests/webdriver_utils.py'))
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Backend for grasp browser extension";
|
||||
mainProgram = "grasp_backend";
|
||||
maintainers = with lib.maintainers; [ hiro98 ];
|
||||
homepage = "https://github.com/karlicoss/grasp/";
|
||||
changelog = "https://github.com/karlicoss/grasp/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-DSDL_INCLUDE_GLU_H"
|
||||
];
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-OjTwAQzKUuXfwZXLsL9XjrJc/0be38CmAGG+CoCeNwk=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=format-overflow"
|
||||
"-Wno-error=deprecated-declarations"
|
||||
|
||||
@@ -87,7 +87,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeBuildType = "MinSizeRel";
|
||||
|
||||
# https://github.com/emsec/hal/issues/598
|
||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-flax-vector-conversions";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
|
||||
NIX_CFLAGS_COMPILE = "-flax-vector-conversions";
|
||||
};
|
||||
|
||||
# some plugins depend on other plugins and need to be able to load them
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "hatch";
|
||||
version = "1.16.1";
|
||||
version = "1.16.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pypa";
|
||||
repo = "hatch";
|
||||
tag = "hatch-v${version}";
|
||||
hash = "sha256-HreVb+RZzQV3p9TaoHDZLHBQFifyH+hocP01u5yU+ms=";
|
||||
hash = "sha256-A91tpoNBTerB2e09dmvgwealId8mnjxcyiVyCkMxQlY=";
|
||||
};
|
||||
|
||||
patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ];
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ bison ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=implicit-int"
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
];
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyperrogue";
|
||||
version = "13.1f";
|
||||
version = "13.1i";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zenorogue";
|
||||
repo = "hyperrogue";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-HJer4CUtpJDI0aRbays9vhNTnmOYHl3eODDaLdxwjyE=";
|
||||
sha256 = "sha256-JFSPbcbPuTKq9TNMCwpjDOEaI3SdAfcnSIi/uZkYT7w=";
|
||||
};
|
||||
|
||||
env = {
|
||||
|
||||
@@ -31,19 +31,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ibmcloud-cli";
|
||||
version = "2.37.1";
|
||||
version = "2.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz";
|
||||
hash =
|
||||
{
|
||||
"x86_64-darwin" = "sha256-NqohbUj+FcReQr3ouq7QNdZOREk0nyCTug2bC4G2kOw=";
|
||||
"aarch64-darwin" = "sha256-SYGela1vfxohcqPzk2DtqBNGaubHFoIgK14L/jwX0gc=";
|
||||
"x86_64-linux" = "sha256-8W3QMLNcDDgb0V8j2HH0iNO+XqVHUsFw7Mmw7WCHsVY=";
|
||||
"aarch64-linux" = "sha256-VtXLIPqDDovptQ83fjxQ4Ggk6WjTN18Z4hWwPuaY/dU=";
|
||||
"i686-linux" = "sha256-qqlumSDuhD9G7dpVx9BCrA1wK96tqGvxDAvgtb4fW1o=";
|
||||
"powerpc64le-linux" = "sha256-oyX2j55ywJdR4lOGSjfI/OcISGJXO7g2t1LI5/89y9w=";
|
||||
"s390x-linux" = "sha256-XC8bMrDlR3dFFpMx/zjjMZz3d37jr9sNRWJEe56IqjE=";
|
||||
"x86_64-darwin" = "sha256-/sekaJxa8+inOBsHucyPE3yWM+Z+64jArGwCht8Corc=";
|
||||
"aarch64-darwin" = "sha256-JrTFbufKjX9uUwUcfxCDjqbZx6drgSmqn0F/xtce/mE=";
|
||||
"x86_64-linux" = "sha256-Zu6XFQeD9Dlny6cex7X6P428MiQftwn9RR4QL3H/0AU=";
|
||||
"aarch64-linux" = "sha256-pfHhAszhbbLKkJnwP94dCaDZNFTLr+2tnO3aHxOch+U=";
|
||||
"i686-linux" = "sha256-v8azVYFa6bBAPJZoOnLr3W+spQZlPFmR92wNTvtRS34=";
|
||||
"powerpc64le-linux" = "sha256-L3cBkNV0iMNhk6b/v1i3JcQJ1SxbffOrs5xqMEOTMY8=";
|
||||
"s390x-linux" = "sha256-UIBu8konMu8Y2U4mix8H9T6Y/2plVVnoiJJgKhGgGs4=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ipscan";
|
||||
version = "3.9.2";
|
||||
version = "3.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/angryip/ipscan/releases/download/${finalAttrs.version}/ipscan_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-5H6QCT7Z3EOJks/jLBluTCgJbqpRMW5iheds9nl4ktU=";
|
||||
hash = "sha256-RLdlcrtpWcO4z7cKSN+y9UJzMBtnli2mAvuJSXCMoJU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.132.1";
|
||||
version = "0.135.1";
|
||||
pname = "jbang";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||
sha256 = "sha256-+JqToH2DHfExu0HtGK1M/YobgjTApWxyp9Hp6VjdRvI=";
|
||||
sha256 = "sha256-7MUiUi7Q4tTCN8RUkO0FM9ZwIqAnTD6yJqUr3199FKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -45,10 +45,12 @@ buildNpmPackage rec {
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
# disable code signing on Darwin
|
||||
env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
# disable code signing on Darwin
|
||||
CSC_IDENTITY_AUTO_DISCOVERY = "false";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
# remove some prebuilt binaries
|
||||
@@ -74,8 +76,6 @@ buildNpmPackage rec {
|
||||
-c.electronVersion=${electron.version}
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -2,51 +2,56 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
mpi,
|
||||
metis,
|
||||
llvmPackages,
|
||||
python3Packages,
|
||||
pythonSupport ? false,
|
||||
isILP64 ? false,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kahip";
|
||||
version = "3.18";
|
||||
version = "3.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KaHIP";
|
||||
repo = "KaHIP";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l8DhVb2G6pQQcH3Wq4NsKw30cSK3sG+gCYRdpibw4ZI=";
|
||||
hash = "sha256-FVbJJpz3ecfME0KZN/5AHuqCkPl/UpR+kHHMyxFzErY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/KaHIP/KaHIP/commit/9d4978c7540a1ccbc9807367d6e3852114e86567.patch?full_index=1";
|
||||
hash = "sha256-nIJL0YmVp9+JUhzEXjoabD1qNEnhtrBnjMWnitYt0eU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
python3Packages.python
|
||||
python3Packages.pybind11
|
||||
];
|
||||
++ lib.optional pythonSupport python3Packages.python;
|
||||
|
||||
buildInputs = [
|
||||
mpi
|
||||
metis
|
||||
];
|
||||
]
|
||||
++ lib.optional pythonSupport python3Packages.pybind11
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
# create meta package providing dist-info for python3Pacakges.kahip that common cmake build does not do
|
||||
propagatedBuildInputs = lib.optional pythonSupport (
|
||||
python3Packages.mkPythonMetaPackage {
|
||||
inherit (finalAttrs) pname version meta;
|
||||
}
|
||||
);
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "64BITMODE" isILP64)
|
||||
(lib.cmakeBool "NONATIVEOPTIMIZATIONS" true)
|
||||
(lib.cmakeBool "BUILDPYTHONMODULE" pythonSupport)
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3Packages.python.sitePackages)
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString pythonSupport ''
|
||||
cp ../python/kahip/* $out/${python3Packages.python.sitePackages}/kahip
|
||||
echo "__version__= '${finalAttrs.version}'" > $out/${python3Packages.python.sitePackages}/kahip/_version.py
|
||||
'';
|
||||
|
||||
doInstallCheck = pythonSupport;
|
||||
|
||||
nativeInstallCheckInputs = lib.optionals pythonSupport [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kaminpar";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KaHIP";
|
||||
repo = "KaMinPar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g343iIpKRclQ+hKdWEVbA7JVuHGBLSq40rK9YUBIy+o=";
|
||||
hash = "sha256-yuceZE3o5dvK7Q8y8nbq7DLMx51GLk2lRh2hMTLdbRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,24 +6,24 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kuttl";
|
||||
version = "0.22.0";
|
||||
version = "0.24.0";
|
||||
cli = "kubectl-kuttl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kudobuilder";
|
||||
repo = "kuttl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M9sZNrze7v1dj0j+hOo30kB87YKxFF/hZJ7R2C/Pzwg=";
|
||||
sha256 = "sha256-Hkq1VukyImRLSQrOtH7IJyt2S8Zl+SNiWJfX4HpiOI4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WhgmseJVfhvVHARI2XaMkRE/sIfpeJj0JzYiAgza6jQ=";
|
||||
vendorHash = "sha256-et/52c++8pgVgguCbPidVg0zFm9p7SVYI97N8sQ2KYQ=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-kuttl" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}"
|
||||
"-X github.com/kudobuilder/kuttl/internal/version.gitVersion=${version}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.8.1";
|
||||
version = "0.8.4";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "lazyjournal";
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "Lifailon";
|
||||
repo = "lazyjournal";
|
||||
tag = version;
|
||||
hash = "sha256-QHVwEesJZiySwEPeDZaU56uY+PJEJXCybvAezhwa59g=";
|
||||
hash = "sha256-7/eQZUht8xs8JoivLR3UNxRQ4Gajyp4vhxF4wM0GpPg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Wl8DmEBt1YtTk9QEvWybSWRQm0Lnfd5q3C/wg+gP33g=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libHX";
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
tag = "v${finalAttrs.version}";
|
||||
owner = "jengelh";
|
||||
repo = "libhx";
|
||||
hash = "sha256-z1/D5dkcDc2VIoGCvunUYsLGq3AV6jZ01Edf1vuUx9o=";
|
||||
hash = "sha256-q9cIZhQx1BjD7Py0VEevKwFflJ1cdFn9RcW6q52t/h8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
docbook_xsl
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ];
|
||||
|
||||
meta = {
|
||||
description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
|
||||
|
||||
@@ -65,7 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# Fixes https://github.com/containers/libkrunfw/issues/55
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.targetPlatform.isAarch64 "-march=armv8-a+crypto";
|
||||
env = lib.optionalAttrs stdenv.targetPlatform.isAarch64 {
|
||||
NIX_CFLAGS_COMPILE = "-march=armv8-a+crypto";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ gtest ];
|
||||
|
||||
# Add optimization flags to address _FORTIFY_SOURCE warning
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-O1"
|
||||
"-std=c++17"
|
||||
];
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SDL2_image
|
||||
];
|
||||
# From some reason, this is needed as otherwise SDL.h is not found
|
||||
NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2";
|
||||
env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
uncrustify,
|
||||
xz,
|
||||
yaml-cpp,
|
||||
versionCheckHook,
|
||||
bash,
|
||||
binutils,
|
||||
coreutils,
|
||||
@@ -38,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "linyaps";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenAtom-Linyaps";
|
||||
repo = finalAttrs.pname;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-iGdZc+i1l/+raI7Pjpj3LOtxvSJ37fUth3VsKaV54u0=";
|
||||
hash = "sha256-FpmsrH4Xphf4QKtAJEaoVdE9S7hWlCayDbEnYZ9o4iI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -99,6 +100,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "CPM_LOCAL_PACKAGES_ONLY" true)
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
# move to the right location for systemd.packages option
|
||||
# https://github.com/NixOS/nixpkgs/blob/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054/nixos/modules/system/boot/systemd.nix#L605
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(lib.cmakeFeature "CMAKE_OSX_ARCHITECTURES" stdenv.hostPlatform.darwinArch)
|
||||
|
||||
@@ -2,31 +2,22 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lurk";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jakwai01";
|
||||
repo = "lurk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sng+mMMKDuI1aSgusJDRFMT5iKNUlp9arp9ruRn0bb0=";
|
||||
hash = "sha256-gVxul9LeNbsP2eP0j5T6AL7pQh8Ls2lht3ki5JQ9kZM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-aarch64-build.patch";
|
||||
url = "https://github.com/JakWai01/lurk/commit/132e6557ddeafbdb1bb1d4d1411099f0d7df7a51.patch?full_index=1";
|
||||
hash = "sha256-B5rNLipnFFWxIhTm+eCacJkw38D7stQ27WIHzgj7Vy0=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-Cmlhhda35FmNg/OvfMRPHBLPRXF5bs0ebBYT7KfierA=";
|
||||
cargoHash = "sha256-NNwcc4rUol9M59XzoQBNw/MfHw3LP6pUtNjw6OY6bMc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/lib.rs \
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -18,21 +18,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-authentication-service";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "matrix-authentication-service";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DfgGh8KAXnGrq2W7V/QWnBF7b3Z26mIWeFQ2tEIPqa4=";
|
||||
hash = "sha256-Cw7EPjN9PLmMxRTHV2DeUWM/BVNrDIQfy//Cn++C98o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r1fG+9mUYKbcAPc7CUUYvFf/Lhjnt6/MDCdCn/uiJU8=";
|
||||
cargoHash = "sha256-aQ6zGaHVEGgrNMhbx2tnb4yQ4B31Nr2gf4BKyJsnP0U=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-UbaUx2wZi/bUVbdphCTcFBCaFQ8tkuvdYkSduCBRzzU=";
|
||||
hash = "sha256-CXS5o1qYXPS5armoT9jLq4vv5ni3hht3ZCMXtNAGBQY=";
|
||||
};
|
||||
|
||||
npmRoot = "frontend";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mcphost";
|
||||
version = "0.33.2";
|
||||
version = "0.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mark3labs";
|
||||
repo = "mcphost";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AQ+qKbvi3TywDrvc2xnw3gTwEi/Qxb3EJdT+1TWjVpM=";
|
||||
hash = "sha256-c+DGu2Re/R7IjMI7nKRJjNBWktDuoMENLRCzxSv23zw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oQEMrd1Lp9oMUCoQc674AyftMx7Tb+1rUoEGhu/ck7U=";
|
||||
vendorHash = "sha256-K/Y6iZS7gcy1ut/idfgfcjb2YeSFNaukRADn4pjJeeA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mercure";
|
||||
version = "0.21.6";
|
||||
version = "0.21.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunglas";
|
||||
repo = "mercure";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hCEoEs6NiShssKER1Z8IVQPF+Ir7wbreGInWmcdnqzE=";
|
||||
hash = "sha256-Dns8rzZJTnALhP8O9HDSjRfdesNYH3Qt/xrK4dMCGS4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/caddy";
|
||||
|
||||
vendorHash = "sha256-GTHJtNO4JqTEDxVMe0yTgnjhfK2aGZpjMTfSFtL29IU=";
|
||||
vendorHash = "sha256-UcCtK7qcwvc54wXr9DpfeMWzqrVz5zdEy4Mv2Qc+PNw=";
|
||||
|
||||
subPackages = [ "mercure" ];
|
||||
excludedPackages = [ "../cmd/mercure" ];
|
||||
|
||||
@@ -12,11 +12,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metabase";
|
||||
version = "0.56.10";
|
||||
version = "0.58.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
|
||||
hash = "sha256-otpNh9TJnUoHjAVVCkrsJO93nIeEfaNC8amZdTvreIE=";
|
||||
hash = "sha256-stMlL0QSM4Py5xh2CsAV53v1FSc9u6NBQ+i5oLfewoQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DMZ_LIBCOMP=OFF"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register";
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register";
|
||||
|
||||
postInstall = ''
|
||||
# make lib findable as libminizip-ng even if compat is enabled
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# mhl.c:1031:58: error: pointer type mismatch in conditional expression []
|
||||
# 1031 | putstr((c1->c_flags & RTRIM) ? rtrim(cp) : cp);
|
||||
NIX_CFLAGS_COMPILE = [ " -Wno-error=incompatible-pointer-types" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=incompatible-pointer-types" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -158,7 +158,7 @@ let
|
||||
in
|
||||
if withScripts then
|
||||
symlinkJoin {
|
||||
name = "msmtp-${version}";
|
||||
pname = "msmtp";
|
||||
inherit version meta;
|
||||
paths = [
|
||||
binaries
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.475";
|
||||
version = "0.0.478";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2Vr36G4KEGDM1fTifZhMOr33B513bVFsOvWGU5usCVU=";
|
||||
hash = "sha256-AGERHGA2jPEXZqueMzVRtVF3UJIEGxX0glVxjS4OuiU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jeH5/x4hIh2Q5bi6o7c0tcQLmyrMp0NJ641fZDPCHkw=";
|
||||
vendorHash = "sha256-FfQMnZD+H0LDLPThOz8BJ6FN/B9pDVT5nt84AmpawO0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/nsc"
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-0skAavJe01b+4Z7LEfS2qIhqkwj8XhOwmflhYPEynw4=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cc65
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nmon";
|
||||
version = "16q";
|
||||
version = "16s";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nmon/lmon${finalAttrs.version}.c";
|
||||
sha256 = "sha256-G3ioFnLBkpGz0RpuMZ3ZsjoCKiYtuh786gCNbfUaylE=";
|
||||
hash = "sha256-BzbOD3KeSMEkp7pWbAacWiNFEcycasknfakvi7RPKxE=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@@ -64,13 +64,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "noctalia-shell";
|
||||
version = "4.2.5";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noctalia-dev";
|
||||
repo = "noctalia-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SHavMqGRv78sND/wQ53OhBBE2VBhgE3bSNRxxo5z7FE=";
|
||||
hash = "sha256-u+M2dCw9PznZTgn51DwHpX4VcU9ZC9Acub7qKhCpr3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail "\''${PACKAGE_PREFIX_DIR}/" ""
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
meta = {
|
||||
description = "Templatized Header Only C++ Implementation of the Python NumPy Library";
|
||||
|
||||
@@ -39,13 +39,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openboard";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBoard-org";
|
||||
repo = "OpenBoard";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CeW8G4aHo+IlB4F/ty48jIjhD7Nc7HFgudVbxrzZ2LU=";
|
||||
hash = "sha256-mu7bhJx+Mv6Megq2jYK1s8oVt8QCMvD6sd2nnxI3VsA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
pname = "openttd-jgrpp";
|
||||
version = "0.67.1";
|
||||
version = "0.69.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
hash = "sha256-GMkcf3XBotPXjZC4TdtOXzutyyIiW4haE+jNIfgozbg=";
|
||||
hash = "sha256-D9Oh05Isf7Atsih6tZBA8xS04aCuE8VS5Ghf0FvrU5A=";
|
||||
};
|
||||
patches = [ ];
|
||||
|
||||
|
||||
@@ -142,41 +142,43 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
NLOPT = nlopt;
|
||||
env = {
|
||||
NLOPT = nlopt;
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString (
|
||||
[
|
||||
"-Wno-ignored-attributes"
|
||||
"-I${opencv.out}/include/opencv4"
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
"-Wno-template-id-cdtor"
|
||||
"-Wno-uninitialized"
|
||||
"-Wno-unused-result"
|
||||
"-Wno-deprecated-declarations"
|
||||
"-Wno-use-after-free"
|
||||
"-Wno-format-overflow"
|
||||
"-Wno-stringop-overflow"
|
||||
"-DBOOST_ALLOW_DEPRECATED_HEADERS"
|
||||
"-DBOOST_MATH_DISABLE_STD_FPCLASSIFY"
|
||||
"-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS"
|
||||
"-DBOOST_MATH_DISABLE_FLOAT128"
|
||||
"-DBOOST_MATH_NO_QUAD_SUPPORT"
|
||||
"-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"
|
||||
"-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"
|
||||
"-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"
|
||||
]
|
||||
# Making it compatible with GCC 14+, see https://github.com/SoftFever/OrcaSlicer/pull/7710
|
||||
++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14") [
|
||||
"-Wno-error=template-id-cdtor"
|
||||
]
|
||||
);
|
||||
NIX_CFLAGS_COMPILE = toString (
|
||||
[
|
||||
"-Wno-ignored-attributes"
|
||||
"-I${opencv.out}/include/opencv4"
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
"-Wno-template-id-cdtor"
|
||||
"-Wno-uninitialized"
|
||||
"-Wno-unused-result"
|
||||
"-Wno-deprecated-declarations"
|
||||
"-Wno-use-after-free"
|
||||
"-Wno-format-overflow"
|
||||
"-Wno-stringop-overflow"
|
||||
"-DBOOST_ALLOW_DEPRECATED_HEADERS"
|
||||
"-DBOOST_MATH_DISABLE_STD_FPCLASSIFY"
|
||||
"-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS"
|
||||
"-DBOOST_MATH_DISABLE_FLOAT128"
|
||||
"-DBOOST_MATH_NO_QUAD_SUPPORT"
|
||||
"-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"
|
||||
"-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"
|
||||
"-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"
|
||||
]
|
||||
# Making it compatible with GCC 14+, see https://github.com/SoftFever/OrcaSlicer/pull/7710
|
||||
++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14") [
|
||||
"-Wno-error=template-id-cdtor"
|
||||
]
|
||||
);
|
||||
|
||||
NIX_LDFLAGS = toString [
|
||||
(lib.optionalString withSystemd "-ludev")
|
||||
"-L${boost186}/lib"
|
||||
"-lboost_log"
|
||||
"-lboost_log_setup"
|
||||
];
|
||||
NIX_LDFLAGS = toString [
|
||||
(lib.optionalString withSystemd "-ludev")
|
||||
"-L${boost186}/lib"
|
||||
"-lboost_log"
|
||||
"-lboost_log_setup"
|
||||
];
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "osslsigncode";
|
||||
version = "2.11";
|
||||
version = "2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtrojnar";
|
||||
repo = "osslsigncode";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-ua/4OouuMWTvfFbdOVVZpf1Z43JoPiptlFl+THaef58=";
|
||||
sha256 = "sha256-UVm0lpw5l8gw+qNGfE57SdvT0Wwo75dUlolwBjBVCwA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pacparser";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manugarg";
|
||||
repo = "pacparser";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks=";
|
||||
hash = "sha256-rHRW/zzQS2vV+rQeZBQNSp2id0Gir1yFPwN2OPMOvVo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -27,7 +27,7 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pan-bindings";
|
||||
pname = "pan-bindings";
|
||||
|
||||
inherit src version;
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# `blend2d.h` moved to `blend2d/blend2d.h` in blend2d >= 0.21.2
|
||||
NIX_CFLAGS_COMPILE = "-I${blend2d.dev}/include/blend2d";
|
||||
env.NIX_CFLAGS_COMPILE = "-I${blend2d.dev}/include/blend2d";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "PDF4QT_INSTALL_TO_USR" false)
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasticscm-client-gui-unwrapped";
|
||||
version = "11.0.16.9872";
|
||||
version = "11.0.16.9915";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-gui_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-gLu0r7eo7XrYwquZurduj1NiKIB7EnRky5vYKW9fks4=";
|
||||
hash = "sha256-T5032/pM30LTQWi55YQEFSeglnnxXlJsZUCXL4JCpnw=";
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
downloadToTemp = true;
|
||||
recursiveHash = true;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasticscm-theme";
|
||||
version = "11.0.16.9890";
|
||||
version = "11.0.16.9915";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-theme_${finalAttrs.version}_amd64.deb";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "poutine";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boostsecurityio";
|
||||
repo = "poutine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mtlwxqJnNANiONPi5AkgQoeG4Xed56by4JykNme8LqA=";
|
||||
hash = "sha256-cz6EBgCPUtuVTAEv36fNtw+8GTXD0jcCD6x9iVa9V9k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qp3Ko+01kk9AH0oCT2Si/si+74gT5KFtPFslwih/IBE=";
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
symlinkJoin rec {
|
||||
name = "prevo-${version}";
|
||||
symlinkJoin {
|
||||
pname = "prevo";
|
||||
inherit (prevo-tools) version;
|
||||
|
||||
paths = [ prevo-tools ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.45";
|
||||
version = "2.46";
|
||||
pname = "profile-cleaner";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graysky2";
|
||||
repo = "profile-cleaner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-10e1S+li7SXKJX2lETSdx84GavWqQYQqyLoBIVToTBI=";
|
||||
sha256 = "sha256-gY6fmm6B6H7tg3xENnqaoy1QEMIf+a3k/C+JcnkyZwo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
# poco 1.14 requires c++17
|
||||
NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu++17" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.270.0";
|
||||
version = "0.271.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oqfefPcGav1TwCq5F+r1eg/hx0CZoyc21rULg9cYquA=";
|
||||
sha256 = "sha256-VSHeHruqGD2cgF5XYlyeGYhcSBlGIC+lgO6Qqrhtb0Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1rBQdT2bSQxOL3vWWWSwaMH8K9op6x7t5asj+qJM/sA=";
|
||||
vendorHash = "sha256-DbxciJXGcjQJZUmCbK8mFAtmKzRkWcMCWgU0SBrKTH0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quarkus-cli";
|
||||
version = "3.30.5";
|
||||
version = "3.31.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-x+G4DwqRMNEO75NND5r388pWnDZMjG7o/6MoCfVZyvk=";
|
||||
hash = "sha256-wKNFWIm/BDkGyerafKskekhfgn5QBcxecUDSw4hhwCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2026-01-23";
|
||||
version = "0-unstable-2026-01-27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "778be81b48eeeeb7991a49a816b350e4a88e0be1";
|
||||
hash = "sha256-Bmfty8W02RVTFU5yhIhkcDmO2yE8ECV87kbAsNNRGcY=";
|
||||
rev = "23efee6616cf3b45e519702363bb1c0748312a6f";
|
||||
hash = "sha256-toAx1+ZjrlAq7wbCm2OcEJxEN+9vfTV1ypikQcbkskU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user