mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
Merge master into staging-next
This commit is contained in:
commit
24e5e7f5fc
41 changed files with 687 additions and 113 deletions
4
doc/hooks/aws-c-common.section.md
Normal file
4
doc/hooks/aws-c-common.section.md
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
# `aws-c-common` {#aws-c-common}
|
||||||
|
|
||||||
|
This hook exposes its own [CMake](#cmake) modules by setting [`CMAKE_MODULE_PATH`](https://cmake.org/cmake/help/latest/variable/CMAKE_MODULE_PATH.html) through [the `cmakeFlags` variable](#cmake-flags)
|
||||||
|
to the nonstandard `$out/lib/cmake` directory, as a workaround for [an upstream bug](https://github.com/awslabs/aws-c-common/issues/844).
|
|
@ -8,6 +8,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks).
|
||||||
autoconf.section.md
|
autoconf.section.md
|
||||||
automake.section.md
|
automake.section.md
|
||||||
autopatchelf.section.md
|
autopatchelf.section.md
|
||||||
|
aws-c-common.section.md
|
||||||
bmake.section.md
|
bmake.section.md
|
||||||
breakpoint.section.md
|
breakpoint.section.md
|
||||||
cernlib.section.md
|
cernlib.section.md
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
# Expose the minimum required version for evaluating Nixpkgs
|
# Expose the minimum required version for evaluating Nixpkgs
|
||||||
"2.3"
|
"2.3.17"
|
||||||
|
|
|
@ -195,6 +195,8 @@
|
||||||
|
|
||||||
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
|
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
|
||||||
|
|
||||||
|
- Nixpkgs now requires Nix 2.3.17 or newer to allow for zstd compressed binary artifacts.
|
||||||
|
|
||||||
- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.
|
- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.
|
||||||
|
|
||||||
- The NVIDIA driver no longer defaults to the proprietary kernel module with versions >= 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open modules.
|
- The NVIDIA driver no longer defaults to the proprietary kernel module with versions >= 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open modules.
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "leo-editor";
|
pname = "leo-editor";
|
||||||
version = "6.8.1";
|
version = "6.8.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "leo-editor";
|
owner = "leo-editor";
|
||||||
repo = "leo-editor";
|
repo = "leo-editor";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-YhZSmk2n/Tg0zx1xuy0LtABNiBB3LmXYlhXoK7/b2tQ=";
|
sha256 = "sha256-LfeqQjzrWzqJ/iTuMOWLnxEZ+SNPVcutNPI+T3WEKnM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
, cmake
|
, cmake
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
, qtbase
|
, qtbase
|
||||||
|
, qtsvg
|
||||||
, bluez
|
, bluez
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
, libao
|
, libao
|
||||||
|
@ -48,13 +49,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dolphin-emu-primehack";
|
pname = "dolphin-emu-primehack";
|
||||||
version = "1.0.6a";
|
version = "1.0.7a";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "shiiion";
|
owner = "shiiion";
|
||||||
repo = "dolphin";
|
repo = "dolphin";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk=";
|
hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -93,6 +94,7 @@ stdenv.mkDerivation rec {
|
||||||
fmt
|
fmt
|
||||||
xz
|
xz
|
||||||
qtbase
|
qtbase
|
||||||
|
qtsvg
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
bluez
|
bluez
|
||||||
udev
|
udev
|
||||||
|
|
|
@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
description = "G-code generator for 3D printer";
|
description = "G-code generator for 3D printer";
|
||||||
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
||||||
license = licenses.agpl3Plus;
|
license = licenses.agpl3Plus;
|
||||||
maintainers = with maintainers; [ moredread tweber tmarkus ];
|
maintainers = with maintainers; [ tweber tmarkus ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
} // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
|
} // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
|
||||||
mainProgram = "PrusaSlicer";
|
mainProgram = "PrusaSlicer";
|
||||||
|
|
|
@ -88,7 +88,7 @@ let
|
||||||
inherit description;
|
inherit description;
|
||||||
homepage = "https://github.com/supermerill/SuperSlicer";
|
homepage = "https://github.com/supermerill/SuperSlicer";
|
||||||
license = licenses.agpl3Plus;
|
license = licenses.agpl3Plus;
|
||||||
maintainers = with maintainers; [ cab404 moredread tmarkus ];
|
maintainers = with maintainers; [ cab404 tmarkus ];
|
||||||
mainProgram = "superslicer";
|
mainProgram = "superslicer";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,20 @@
|
||||||
{ lib, stdenv, fetchurl, libxml2, freetype, libGLU, libGL, glew
|
{
|
||||||
, qtbase, wrapQtAppsHook, autoPatchelfHook, python3
|
lib,
|
||||||
, cmake, libjpeg, llvmPackages }:
|
stdenv,
|
||||||
|
fetchurl,
|
||||||
|
libxml2,
|
||||||
|
freetype,
|
||||||
|
libGLU,
|
||||||
|
libGL,
|
||||||
|
glew,
|
||||||
|
qtbase,
|
||||||
|
wrapQtAppsHook,
|
||||||
|
autoPatchelfHook,
|
||||||
|
python3,
|
||||||
|
cmake,
|
||||||
|
libjpeg,
|
||||||
|
llvmPackages,
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tulip";
|
pname = "tulip";
|
||||||
|
@ -11,21 +25,37 @@ stdenv.mkDerivation rec {
|
||||||
hash = "sha256-7z21WkPi1v2AGishDmXZPAedMjgXPRnpUiHTzEnc5LY=";
|
hash = "sha256-7z21WkPi1v2AGishDmXZPAedMjgXPRnpUiHTzEnc5LY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake wrapQtAppsHook ]
|
nativeBuildInputs = [
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
cmake
|
||||||
|
wrapQtAppsHook
|
||||||
|
] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||||
|
|
||||||
buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ]
|
buildInputs =
|
||||||
|
[
|
||||||
|
libxml2
|
||||||
|
freetype
|
||||||
|
glew
|
||||||
|
libjpeg
|
||||||
|
qtbase
|
||||||
|
python3
|
||||||
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ];
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
|
libGLU
|
||||||
|
libGL
|
||||||
|
];
|
||||||
|
|
||||||
qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
|
qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
|
env.NIX_CFLAGS_COMPILE =
|
||||||
# fatal error: 'Python.h' file not found
|
# error: invalid conversion from 'unsigned char*' to 'char*'
|
||||||
"-I${python3}/include/${python3.libPrefix}"
|
"-fpermissive "
|
||||||
# error: format string is not a string literal (potentially insecure)
|
+ (lib.optionalString stdenv.hostPlatform.isDarwin (toString [
|
||||||
"-Wno-format-security"
|
# fatal error: 'Python.h' file not found
|
||||||
]);
|
"-I${python3}/include/${python3.libPrefix}"
|
||||||
|
# error: format string is not a string literal (potentially insecure)
|
||||||
|
"-Wno-format-security"
|
||||||
|
]));
|
||||||
|
|
||||||
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
|
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -1,23 +1,29 @@
|
||||||
{ lib, stdenv, fetchFromGitHub }:
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
llvmPackages,
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "adolc";
|
pname = "adolc";
|
||||||
version = "2.7.2";
|
version = "2.7.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "coin-or";
|
owner = "coin-or";
|
||||||
repo = "ADOL-C";
|
repo = "ADOL-C";
|
||||||
sha256 = "1w0x0p32r1amfmh2lyx33j4cb5bpkwjr5z0ll43zi5wf5gsvckd1";
|
rev = "refs/tags/releases/${finalAttrs.version}";
|
||||||
rev = "releases/${version}";
|
hash = "sha256-oU229SuOl/gHoRT8kiWfd5XFiByjeypgdVWFLMYFHfA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [ "--with-openmp-flag=-fopenmp" ];
|
configureFlags = [ "--with-openmp-flag=-fopenmp" ];
|
||||||
|
|
||||||
|
buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Automatic Differentiation of C/C++";
|
description = "Automatic Differentiation of C/C++";
|
||||||
homepage = "https://github.com/coin-or/ADOL-C";
|
homepage = "https://github.com/coin-or/ADOL-C";
|
||||||
maintainers = [ maintainers.bzizou ];
|
maintainers = [ maintainers.bzizou ];
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
||||||
|
|
405
pkgs/by-name/be/beszel/0001-fix-build.patch
Normal file
405
pkgs/by-name/be/beszel/0001-fix-build.patch
Normal file
|
@ -0,0 +1,405 @@
|
||||||
|
From 402b2d72ad3bcc4a8cdb0115220888154bdb3c39 Mon Sep 17 00:00:00 2001
|
||||||
|
From: wxt <3264117476@qq.com>
|
||||||
|
Date: Tue, 29 Oct 2024 19:32:07 +0800
|
||||||
|
Subject: [PATCH] fix build
|
||||||
|
|
||||||
|
---
|
||||||
|
package-lock.json | 368 ++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 368 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/package-lock.json b/package-lock.json
|
||||||
|
index 8e4532e..d3b3605 100644
|
||||||
|
--- a/package-lock.json
|
||||||
|
+++ b/package-lock.json
|
||||||
|
@@ -679,6 +679,262 @@
|
||||||
|
"node": ">=6.9.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
+ "node_modules/@esbuild/aix-ppc64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "ppc64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "aix"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/android-arm": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "android"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/android-arm64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "android"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/android-x64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "x64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "android"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/darwin-arm64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "darwin"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/darwin-x64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "x64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "darwin"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/freebsd-arm64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "freebsd"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/freebsd-x64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "x64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "freebsd"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-arm": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-arm64": {
|
||||||
|
+ "version": "0.24.0",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
|
||||||
|
+ "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=18"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-ia32": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "ia32"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-loong64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "loong64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-mips64el": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "mips64el"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-ppc64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "ppc64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-riscv64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "riscv64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/linux-s390x": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "s390x"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
"node_modules/@esbuild/linux-x64": {
|
||||||
|
"version": "0.21.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
|
||||||
|
@@ -695,6 +951,102 @@
|
||||||
|
"node": ">=12"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
+ "node_modules/@esbuild/netbsd-x64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "x64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "netbsd"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/openbsd-x64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "x64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "openbsd"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/sunos-x64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "x64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "sunos"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/win32-arm64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "win32"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/win32-ia32": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "ia32"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "win32"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ "node_modules/@esbuild/win32-x64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "x64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "win32"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
"node_modules/@floating-ui/core": {
|
||||||
|
"version": "1.6.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.4.tgz",
|
||||||
|
@@ -3545,6 +3897,22 @@
|
||||||
|
"@esbuild/win32-x64": "0.21.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
+ "node_modules/esbuild/node_modules/@esbuild/linux-arm64": {
|
||||||
|
+ "version": "0.21.5",
|
||||||
|
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
|
||||||
|
+ "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
|
||||||
|
+ "cpu": [
|
||||||
|
+ "arm64"
|
||||||
|
+ ],
|
||||||
|
+ "license": "MIT",
|
||||||
|
+ "optional": true,
|
||||||
|
+ "os": [
|
||||||
|
+ "linux"
|
||||||
|
+ ],
|
||||||
|
+ "engines": {
|
||||||
|
+ "node": ">=12"
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
"node_modules/escalade": {
|
||||||
|
"version": "3.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
|
||||||
|
--
|
||||||
|
2.46.1
|
||||||
|
|
84
pkgs/by-name/be/beszel/package.nix
Normal file
84
pkgs/by-name/be/beszel/package.nix
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
{
|
||||||
|
buildGoModule,
|
||||||
|
lib,
|
||||||
|
fetchFromGitHub,
|
||||||
|
nix-update-script,
|
||||||
|
buildNpmPackage,
|
||||||
|
fetchpatch,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "beszel";
|
||||||
|
version = "0.6.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "henrygd";
|
||||||
|
repo = "beszel";
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
hash = "sha256-x9HU+sDjxRthC4ROJaKbuKHPHgxFSpyn/dywyGWE/v8=";
|
||||||
|
};
|
||||||
|
|
||||||
|
webui = buildNpmPackage {
|
||||||
|
inherit
|
||||||
|
pname
|
||||||
|
version
|
||||||
|
src
|
||||||
|
meta
|
||||||
|
;
|
||||||
|
|
||||||
|
npmFlags = [ "--legacy-peer-deps" ];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# add missing @esbuild for multi platform
|
||||||
|
# https://github.com/henrygd/beszel/pull/235
|
||||||
|
# add missing @esbuild for multi platform
|
||||||
|
# https://github.com/henrygd/beszel/pull/235
|
||||||
|
./0001-fix-build.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out
|
||||||
|
cp -r dist/* $out
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
sourceRoot = "${src.name}/beszel/site";
|
||||||
|
|
||||||
|
npmDepsHash = "sha256-t7Qcuvqbt0sPHAu3vcZaU8/Ij2yY5/g1TguozlKu0mU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
sourceRoot = "${src.name}/beszel";
|
||||||
|
|
||||||
|
vendorHash = "sha256-/FePQkqoeuH63mV81v1NxpFw9osMUCcZ1bP+0yN1Qlo=";
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
mkdir -p site/dist
|
||||||
|
cp -r ${webui}/* site/dist
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/bin/agent $out/bin/beszel-agent
|
||||||
|
mv $out/bin/hub $out/bin/beszel-hub
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://github.com/henrygd/beszel";
|
||||||
|
changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}";
|
||||||
|
description = "Lightweight server monitoring hub with historical data, docker stats, and alerts";
|
||||||
|
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
};
|
||||||
|
}
|
|
@ -20,17 +20,25 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
|
buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
|
||||||
|
|
||||||
|
postPatch = lib.optional (!stdenv.hostPlatform.isx86) ''
|
||||||
|
substituteInPlace makefile \
|
||||||
|
--replace-fail "-mavx2" ""
|
||||||
|
|
||||||
|
substituteInPlace makefile.cuda \
|
||||||
|
--replace-fail "-mavx2" ""
|
||||||
|
'';
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"CC=$(CXX)"
|
"CC=$(CXX)"
|
||||||
"PREFIX=${placeholder "out"}"
|
"PREFIX=${placeholder "out"}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "High performance block-sorting data compression library";
|
description = "High performance block-sorting data compression library";
|
||||||
homepage = "http://libbsc.com/";
|
homepage = "http://libbsc.com/";
|
||||||
maintainers = with maintainers; [ sigmanificient ];
|
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||||
license = lib.licenses.asl20;
|
license = lib.licenses.asl20;
|
||||||
platforms = platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
mainProgram = "bsc";
|
mainProgram = "bsc";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -9,16 +9,16 @@
|
||||||
|
|
||||||
buildGo123Module rec {
|
buildGo123Module rec {
|
||||||
pname = "d2";
|
pname = "d2";
|
||||||
version = "0.6.7";
|
version = "0.6.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "terrastruct";
|
owner = "terrastruct";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-HD59q4GFrkjLvQQdYGA7ISwXJztweRxoV5AWbHinTx8=";
|
hash = "sha256-Sd4AkXKQVRJIgQTb7BbDNb8DbULyoWX8TuFtiu+Km5Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-HcWyhQFRI+dvOhUrVaL9U5PvL/CDBpaOYPXSkYzIYf4=";
|
vendorHash = "sha256-PMqN/6kzXR0d1y1PigBE0KJ8uP14n+qQziFqGai5zLE=";
|
||||||
|
|
||||||
excludedPackages = [ "./e2etests" ];
|
excludedPackages = [ "./e2etests" ];
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gh-dash";
|
pname = "gh-dash";
|
||||||
version = "4.7.0";
|
version = "4.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dlvhdr";
|
owner = "dlvhdr";
|
||||||
repo = "gh-dash";
|
repo = "gh-dash";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-+tUG+ReP8y6wI4XZsR2Look4LAwK79CZf9fWUgkx4O0=";
|
hash = "sha256-q/p7WDbJU27+m/4HVQJ7zRo0r1A0FkV21gJqHJYHHBE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";
|
vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";
|
||||||
|
|
|
@ -74,11 +74,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gnome-control-center";
|
pname = "gnome-control-center";
|
||||||
version = "47.0.1";
|
version = "47.1.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-h+7fdDN7PGHfGaDcjCW1wpYp+1+Rm+w0y9CkscfbNWc=";
|
hash = "sha256-BR/UBXFX9LIzcBP778luPRKWVOP8lg1ISdNUJSQAvnc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -31,13 +31,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gnome-online-accounts";
|
pname = "gnome-online-accounts";
|
||||||
version = "3.52.0";
|
version = "3.52.1";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
|
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-YxlTqdnqCYsmigu+LfGMu+xngVicrGsEVSFGCe4Su9g=";
|
hash = "sha256-N8dSL/lFT4NxtahyW7p27XQwyVsfnvx/66YmjwUtHrc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
|
|
@ -31,11 +31,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-remote-desktop";
|
pname = "gnome-remote-desktop";
|
||||||
version = "47.0";
|
version = "47.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
|
url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
|
||||||
hash = "sha256-iqVXdXV7KZ3r5Bfhaebij+y/GM5hHtF2+g1lCrU0R3Y=";
|
hash = "sha256-BG0Py4m4jQskaczTUGPbW0KkUfkHEbU/H6OrFJGsGN4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gnome-shell-extensions";
|
pname = "gnome-shell-extensions";
|
||||||
version = "47.0";
|
version = "47.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-UPBPe6UO3tEM6gekcF+zNj6Gkm0QARvlslA3Vmdwg08=";
|
hash = "sha256-6UOMxdOfmHXf0E6gq7UeWWLqrVwgJ0EjJDsWEgmLOoU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -70,7 +70,7 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gnome-shell";
|
pname = "gnome-shell";
|
||||||
version = "47.0";
|
version = "47.1";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-eiB3DGKQrWmpqCyEl8sn4b+GPzh9sl6Y5ULk9sXwbe0=";
|
hash = "sha256-tGdXX4wVnSBVclhRfw3Wjf0BR9EbSNl6uOH3CbxSKmM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -46,11 +46,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gvfs";
|
pname = "gvfs";
|
||||||
version = "1.56.0";
|
version = "1.56.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-RB0jVscmFjZM20IK+WGZEToT7Z4UbyF1/jc5ia2to54=";
|
hash = "sha256-hnMczsZ5ZI+HNOI3sd4ZDr3ubkyMD1b0VMMViOUJqhA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -9,16 +9,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "hickory-dns";
|
pname = "hickory-dns";
|
||||||
version = "0.25.0-alpha.2";
|
version = "0.25.0-alpha.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hickory-dns";
|
owner = "hickory-dns";
|
||||||
repo = "hickory-dns";
|
repo = "hickory-dns";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-bEVApMM6/I3nF1lyRhd+7YtZuSAwiozRkMorRLhLOBY=";
|
hash = "sha256-P9H21X/lZ8U/yfCL/rCuP9A1wnL7UuTcX7GlCuwo5ZQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-Rq4l1iV70nlhBaJ02hc+dmNZ/Q7qrHoF0Kp0MTmu22A=";
|
cargoHash = "sha256-3hiMBwr6XT4M7J5KeH9bfGYMjZqOmYDda2Iml2emYMY=";
|
||||||
|
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
@ -26,7 +26,13 @@ rustPlatform.buildRustPackage rec {
|
||||||
# tests expect internet connectivity to query real nameservers like 8.8.8.8
|
# tests expect internet connectivity to query real nameservers like 8.8.8.8
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script {
|
||||||
|
# remove when 0.25.0 is released
|
||||||
|
extraArgs = [
|
||||||
|
"--version"
|
||||||
|
"unstable"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Rust based DNS client, server, and resolver";
|
description = "Rust based DNS client, server, and resolver";
|
||||||
|
|
|
@ -20,14 +20,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "htcondor";
|
pname = "htcondor";
|
||||||
version = "23.10.1";
|
version = "24.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "htcondor";
|
owner = "htcondor";
|
||||||
repo = "htcondor";
|
repo = "htcondor";
|
||||||
|
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-5gxylfqG87dUEQT3e3vNgtTqWk0QTgWXwAdEAiIuc/E=";
|
hash = "sha256-k3GXaBSeRl6GJDm5+NRkV0E18RDUBYuoy2/u3ENsEyM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildGo123Module,
|
buildGoModule,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGo123Module rec {
|
buildGoModule rec {
|
||||||
pname = "kubelogin";
|
pname = "kubelogin";
|
||||||
version = "1.30.1";
|
version = "1.31.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "int128";
|
owner = "int128";
|
||||||
repo = "kubelogin";
|
repo = "kubelogin";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-aoLPT3lX+q426QlxAPsjeQyTZMnmqMGh85jJPU7lQVU=";
|
hash = "sha256-IEKP5mHxJyGzlxNL4h0MR/Ge7g1kKidIjinYr+bL6as=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
@ -22,7 +22,7 @@ buildGo123Module rec {
|
||||||
"-X main.version=v${version}"
|
"-X main.version=v${version}"
|
||||||
];
|
];
|
||||||
|
|
||||||
vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY=";
|
vendorHash = "sha256-3hNc16zpazm9YqDx2M/RafCBLev2S8TzJzClGRkKydg=";
|
||||||
|
|
||||||
# test all packages
|
# test all packages
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
|
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
mainProgram = "mediathek";
|
mainProgram = "mediathek";
|
||||||
maintainers = with maintainers; [ moredread ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
llvmPackages_19,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
|
||||||
gtest,
|
gtest,
|
||||||
|
@ -23,15 +24,18 @@
|
||||||
testers,
|
testers,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
let
|
||||||
|
stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
|
||||||
|
in
|
||||||
|
stdenv'.mkDerivation (finalAttrs: {
|
||||||
pname = "mesonlsp";
|
pname = "mesonlsp";
|
||||||
version = "4.3.5";
|
version = "4.3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "JCWasmx86";
|
owner = "JCWasmx86";
|
||||||
repo = "mesonlsp";
|
repo = "mesonlsp";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs=";
|
hash = "sha256-QhZv4PTcf1jzSOcp1+bPZWf5COugCIMq1zkhc0PJjUQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./disable-tests-that-require-network-access.patch ];
|
patches = [ ./disable-tests-that-require-network-access.patch ];
|
||||||
|
@ -163,5 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
mainProgram = "mesonlsp";
|
mainProgram = "mesonlsp";
|
||||||
maintainers = with maintainers; [ paveloom ];
|
maintainers = with maintainers; [ paveloom ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
# ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous
|
||||||
|
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
fetchurl,
|
fetchurl,
|
||||||
|
fetchpatch,
|
||||||
runCommand,
|
runCommand,
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
@ -68,7 +69,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "mutter";
|
pname = "mutter";
|
||||||
version = "47.0";
|
version = "47.1";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
@ -79,9 +80,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-LQ6pAVCsbNAhnQB42wXW4VFNauIb+fP3QNT7A5EpAWs=";
|
hash = "sha256-kFR0oyzZmzQ0LNaedLsBlxs4fi+iI2G22ZrdEJQJ3ck=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix cursor positioning
|
||||||
|
# https://gitlab.gnome.org/GNOME/mutter/-/issues/3696
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/5bcaa7c80b7640e2da6135cdff83eba77c202407.patch";
|
||||||
|
hash = "sha256-+LDTZRagBltarGvHtTI94mA70DrkonuqA+ibLkjvZ50=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Degl_device=true"
|
"-Degl_device=true"
|
||||||
"-Dinstalled_tests=false" # TODO: enable these
|
"-Dinstalled_tests=false" # TODO: enable these
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vale";
|
pname = "vale";
|
||||||
version = "3.8.0";
|
version = "3.9.0";
|
||||||
|
|
||||||
subPackages = [ "cmd/vale" ];
|
subPackages = [ "cmd/vale" ];
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||||
owner = "errata-ai";
|
owner = "errata-ai";
|
||||||
repo = "vale";
|
repo = "vale";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-0opa8F0cpC0uh51JDgofxl6e0oecxgkEufnLfxtkaOw=";
|
hash = "sha256-4zDngF2K6Fsn/Ml4rhHQxDXOD7meXePoqZ9+XPrHO0g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";
|
vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";
|
||||||
|
|
|
@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
"--enable-newlib-retargetable-locking"
|
"--enable-newlib-retargetable-locking"
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66
|
# apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "babelfont";
|
pname = "babelfont";
|
||||||
version = "3.0.5";
|
version = "3.0.6";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
# PyPI source tarballs omit tests, fetch from Github instead
|
# PyPI source tarballs omit tests, fetch from Github instead
|
||||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||||
owner = "simoncozens";
|
owner = "simoncozens";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-9PEOkkm7qH4ExiJJKrTZX5Ph/urtOyFsy7jjtFepncU=";
|
hash = "sha256-kbL6z5610A41bfbDm0nyyh1tv+7SeXx8vvXxwLcTZL0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|
|
@ -17,16 +17,16 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "lacuscore";
|
pname = "lacuscore";
|
||||||
version = "1.11.3";
|
version = "1.12.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ail-project";
|
owner = "ail-project";
|
||||||
repo = "LacusCore";
|
repo = "LacusCore";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-eVcfJXkjrS752T18wKrIwfwEkCuR1eIoVZERMk/stgQ=";
|
hash = "sha256-83OD/oGzjLsW0FRFyW6Yh9pwh/lcCfZDIe6uahhTRVc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
fetchPypi,
|
fetchPypi,
|
||||||
setuptools,
|
setuptools,
|
||||||
autobahn,
|
autobahn,
|
||||||
mock,
|
|
||||||
twisted,
|
twisted,
|
||||||
python,
|
python,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
|
@ -12,12 +11,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "magic-wormhole-transit-relay";
|
pname = "magic-wormhole-transit-relay";
|
||||||
version = "0.3.1";
|
version = "0.4.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-LvLvvk008OYkhw+EIln9czuncVLtMQr0NJd0piiEkA4=";
|
hash = "sha256-kS2DXaIbESZsdxEdybXlgAJj/AuY8KF5liJn30GBnow=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -39,7 +38,6 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
mock
|
|
||||||
twisted
|
twisted
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -22,16 +22,16 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "playwrightcapture";
|
pname = "playwrightcapture";
|
||||||
version = "1.26.3";
|
version = "1.27.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Lookyloo";
|
owner = "Lookyloo";
|
||||||
repo = "PlaywrightCapture";
|
repo = "PlaywrightCapture";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-lZ0zteLZFKSeFBXWxUnPwlC9VVjUPulUCUocPGOUmuI=";
|
hash = "sha256-cfgNeUZh492SkgfSJZyaDDeqxC3vHopdIe5UcKHFVck=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
|
|
@ -32,6 +32,12 @@ buildPythonPackage rec {
|
||||||
hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
|
hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# build-time constriant, used to ensure forward and backward compat
|
||||||
|
substituteInPlace pyproject.toml setup.cfg \
|
||||||
|
--replace-fail "numpy>=2.0.0" "numpy"
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cython_0
|
cython_0
|
||||||
setuptools
|
setuptools
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "stripe";
|
pname = "stripe";
|
||||||
version = "11.1.0";
|
version = "11.2.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-H6xmDcwwFCaMr8lKRevqxm8adSNl9gAZ0iY+DB4Plls=";
|
hash = "sha256-TFPWHXtZYHAyS/pdchWEMUX+VGbkiXPYKKq0GtIJtc4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
stdenv,
|
||||||
pythonOlder,
|
pythonOlder,
|
||||||
requests,
|
requests,
|
||||||
numpy,
|
numpy,
|
||||||
|
@ -45,7 +46,7 @@ buildPythonPackage rec {
|
||||||
./remove-pytest-coverage-flags.patch
|
./remove-pytest-coverage-flags.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
dependencies = [
|
||||||
requests
|
requests
|
||||||
numpy
|
numpy
|
||||||
pandas
|
pandas
|
||||||
|
@ -71,25 +72,34 @@ buildPythonPackage rec {
|
||||||
pandas-datareader
|
pandas-datareader
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests =
|
||||||
# touches network
|
[
|
||||||
"test_relevant_extraction"
|
# touches network
|
||||||
"test_characteristics_downloaded_robot_execution_failures"
|
"test_relevant_extraction"
|
||||||
"test_index"
|
"test_characteristics_downloaded_robot_execution_failures"
|
||||||
"test_binary_target_is_default"
|
"test_index"
|
||||||
"test_characteristics_downloaded_robot_execution_failures"
|
"test_binary_target_is_default"
|
||||||
"test_extraction_runs_through"
|
"test_characteristics_downloaded_robot_execution_failures"
|
||||||
"test_multilabel_target_on_request"
|
"test_extraction_runs_through"
|
||||||
];
|
"test_multilabel_target_on_request"
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
# RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted
|
||||||
|
# may require extra privileges on darwin
|
||||||
|
"test_local_dask_cluster_extraction_one_worker"
|
||||||
|
"test_local_dask_cluster_extraction_two_worker"
|
||||||
|
"test_dask_cluster_extraction_one_worker"
|
||||||
|
"test_dask_cluster_extraction_two_workers"
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "tsfresh" ];
|
pythonImportsCheck = [ "tsfresh" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Automatic extraction of relevant features from time series";
|
description = "Automatic extraction of relevant features from time series";
|
||||||
mainProgram = "run_tsfresh";
|
mainProgram = "run_tsfresh";
|
||||||
homepage = "https://github.com/blue-yonder/tsfresh";
|
homepage = "https://github.com/blue-yonder/tsfresh";
|
||||||
changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst";
|
changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst";
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with maintainers; [ mbalatsko ];
|
maintainers = with lib.maintainers; [ mbalatsko ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,9 +5,8 @@
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, git
|
, git
|
||||||
, cctools
|
, cctools
|
||||||
, DarwinTools
|
, darwin
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, CoreServices
|
|
||||||
, bison
|
, bison
|
||||||
, openssl
|
, openssl
|
||||||
, protobuf
|
, protobuf
|
||||||
|
@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
|
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
|
||||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
|
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
curl
|
curl
|
||||||
|
@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
antlr.runtime.cpp
|
antlr.runtime.cpp
|
||||||
] ++ pythonDeps
|
] ++ pythonDeps
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
|
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
# Build MySQL
|
# Build MySQL
|
||||||
|
|
|
@ -5,9 +5,8 @@
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, git
|
, git
|
||||||
, cctools
|
, cctools
|
||||||
, DarwinTools
|
, darwin
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, CoreServices
|
|
||||||
, bison
|
, bison
|
||||||
, openssl
|
, openssl
|
||||||
, protobuf
|
, protobuf
|
||||||
|
@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
|
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
|
||||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
|
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ];
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
curl
|
curl
|
||||||
|
@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
antlr.runtime.cpp
|
antlr.runtime.cpp
|
||||||
] ++ pythonDeps
|
] ++ pythonDeps
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
|
++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
# Build MySQL
|
# Build MySQL
|
||||||
|
|
|
@ -14,12 +14,12 @@ let
|
||||||
# kernel config in the xanmod version commit
|
# kernel config in the xanmod version commit
|
||||||
variants = {
|
variants = {
|
||||||
lts = {
|
lts = {
|
||||||
version = "6.6.59";
|
version = "6.6.60";
|
||||||
hash = "sha256-VImhbdU+WAP0QRnYjHBNKYw5NlMDCBy8HJyP2NQBNHY=";
|
hash = "sha256-hbuMuLoXVaFb/HnkVlJm8BSwStxsWmz5e4y65kXBJto=";
|
||||||
};
|
};
|
||||||
main = {
|
main = {
|
||||||
version = "6.11.6";
|
version = "6.11.7";
|
||||||
hash = "sha256-t0kuKK2f8D1vxoX5dJnodTu3aBmzCc8F7tHwVAUHP1M=";
|
hash = "sha256-+gj6sR20v4+NHR4cqsVK5fVpqXs9zxcBh0kJUH5qpNE=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -21,14 +21,14 @@ let
|
||||||
in
|
in
|
||||||
python.pkgs.buildPythonApplication rec {
|
python.pkgs.buildPythonApplication rec {
|
||||||
pname = "esphome";
|
pname = "esphome";
|
||||||
version = "2024.10.2";
|
version = "2024.10.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-WEsFgmwH6OGkAn1c0h/HBhBJr2329YHSKMZzjEDTKNg=";
|
hash = "sha256-13hNX9uaQbO/IKUkGaOITKh+REqUCHirbTPRgomzHBU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-systems = with python.pkgs; [
|
build-systems = with python.pkgs; [
|
||||||
|
|
|
@ -540,8 +540,6 @@ with pkgs;
|
||||||
|
|
||||||
inherit ({
|
inherit ({
|
||||||
mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
|
mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
|
||||||
inherit (darwin) DarwinTools;
|
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
|
||||||
antlr = antlr4_10;
|
antlr = antlr4_10;
|
||||||
icu = icu73;
|
icu = icu73;
|
||||||
protobuf = protobuf_24;
|
protobuf = protobuf_24;
|
||||||
|
@ -551,8 +549,6 @@ with pkgs;
|
||||||
;
|
;
|
||||||
|
|
||||||
mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
|
mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
|
||||||
inherit (darwin) DarwinTools;
|
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
|
||||||
antlr = antlr4_10;
|
antlr = antlr4_10;
|
||||||
icu = icu73;
|
icu = icu73;
|
||||||
protobuf = protobuf_24;
|
protobuf = protobuf_24;
|
||||||
|
@ -1521,9 +1517,8 @@ with pkgs;
|
||||||
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox;
|
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox;
|
||||||
};
|
};
|
||||||
|
|
||||||
dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
|
dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
|
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
|
||||||
fmt = fmt_8;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
### APPLICATIONS/EMULATORS/RETROARCH
|
### APPLICATIONS/EMULATORS/RETROARCH
|
||||||
|
@ -14861,6 +14856,8 @@ with pkgs;
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
kubelogin-oidc = callPackage ../by-name/ku/kubelogin-oidc/package.nix { buildGoModule = buildGo123Module; };
|
||||||
|
|
||||||
kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { };
|
kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { };
|
||||||
|
|
||||||
linkerd = callPackage ../applications/networking/cluster/linkerd { };
|
linkerd = callPackage ../applications/networking/cluster/linkerd { };
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue