gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-13 06:05:02 +00:00
committed by GitHub
parent 75012ba806 a0620779ec
commit d64d756cde
51 changed files with 678 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/security/dhparams.nix
+1 -1
View File
@@ -157,7 +157,7 @@ in {
continue
fi
'') cfg.params)}
rm $file
rm "$file"
done
# TODO: Ideally this would be removing the *former* cfg.path, though
pkgs/applications/audio/cozy/default.nix
+8
View File
@@ -24,6 +24,14 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw";
};
# FIX: The "Support Debian non-standard python paths" resolves to store path of python
postPatch = ''
substituteInPlace meson.build \
--replace-fail \
'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=""))' \
"print(\"$out/${python3Packages.python.sitePackages}\")"
'';
nativeBuildInputs = [
meson
ninja
pkgs/applications/editors/nano/default.nix
+2 -2
View File
@@ -15,11 +15,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
version = "8.1";
version = "8.2";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
hash = "sha256-k7Pj6RVa44n+nM+ct6s4DqwpYCg1ujB3si9k0PDL6Ms=";
hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s=";
};
nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;
pkgs/applications/editors/zile/default.nix
+2
View File
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
# fiddle with the terminal.
doCheck = false;
env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
# XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
gl_cv_func_fstatat_zero_flag="yes";
pkgs/applications/networking/browsers/microsoft-edge/default.nix
+6 -6
View File
@@ -1,20 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "129.0.2792.12";
version = "129.0.2792.21";
revision = "1";
hash = "sha256-LWu5DKCoGSFqUZqgvKx3aoZRzAf6FR3hJnk/agAV9sI=";
hash = "sha256-NrDRroKyjY9zC9KoMWaEPAPnu+JNNDZwLVbuDvoUG1M=";
};
dev = import ./browser.nix {
channel = "dev";
version = "129.0.2792.10";
version = "130.0.2808.0";
revision = "1";
hash = "sha256-jw/muaunLlrtZADrD7asVH+o/u3cp3NyvjRXqPWyHJI=";
hash = "sha256-6mqStxS9HJvfKbrGqQGlqQKXc2SnvOycirPihfnkaLI=";
};
stable = import ./browser.nix {
channel = "stable";
version = "128.0.2739.54";
version = "128.0.2739.67";
revision = "1";
hash = "sha256-qiLZExLU3f6l+qPEGiqOuDgjqOtSyhPwSt7kQfBBSyg=";
hash = "sha256-Y8PxyAibuEhwKJpqnhtBy1F2Kn+ONw6NVtC25R+fFVo=";
};
}
pkgs/applications/office/morgen/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "morgen";
version = "3.5.5";
version = "3.5.6";
src = fetchurl {
url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8=";
hash = "sha256-knguIcvGCwlI83DIaX/EYt/15azMoxEWNtFIXYqLops=";
};
nativeBuildInputs = [
pkgs/by-name/be/beeper-bridge-manager/package.nix
+2 -2
View File
@@ -17,11 +17,11 @@ buildGoModule rec {
vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M=";
meta = {
description = "Tool for running self-hosted bridges with the Beeper Matrix server. ";
description = "Tool for running self-hosted bridges with the Beeper Matrix server.";
homepage = "https://github.com/beeper/bridge-manager";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.heywoodlh ];
mainProgram = "bbctl";
changelog = "https://github.com/beeper/bridge-manager/releases/tag/v{version}";
changelog = "https://github.com/beeper/bridge-manager/releases/tag/v${version}";
};
}
pkgs/by-name/ge/gemmi/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gemmi";
version = "0.6.6";
version = "0.6.7";
src = fetchFromGitHub {
owner = "project-gemmi";
repo = "gemmi";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-S31oCp6kLSYgmRaW7Q9/dMhjJ5Y0sK3WPpg2/ZMPyMg=";
hash = "sha256-Y7gQSh9C7smoXuGWgpJI3hPIg06Jns+1dBpmMxuCrKE=";
};
nativeBuildInputs =
pkgs/by-name/gi/git-igitt/package.nix
+3 -1
View File
@@ -6,6 +6,8 @@
libgit2,
oniguruma,
zlib,
stdenv,
darwin,
nix-update-script,
}:
@@ -31,7 +33,7 @@ rustPlatform.buildRustPackage {
libgit2
oniguruma
zlib
];
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
pkgs/by-name/go/got/package.nix
+2 -2
View File
@@ -27,11 +27,11 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "got";
version = "0.102";
version = "0.103";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
hash = "sha256-qstQ6mZLCdYL5uQauMt7nGlEdPkPneGfu36RbaboN3c=";
hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg=";
};
nativeBuildInputs = [ pkg-config bison ]
pkgs/by-name/gr/graphicsmagick/package.nix
+2 -1
View File
@@ -14,6 +14,7 @@
, libtool
, libwebp
, libxml2
, libheifSupport ? true, libheif
, nukeReferences
, pkg-config
, quantumdepth ? 8
@@ -47,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
libwebp
libxml2
zlib
];
] ++ lib.optionals libheifSupport [ libheif ];
nativeBuildInputs = [
nukeReferences
pkgs/by-name/jo/jogger/package.nix
+72
View File
@@ -0,0 +1,72 @@
{
lib,
stdenv,
fetchFromGitea,
rustPlatform,
meson,
ninja,
pkg-config,
cargo,
rustc,
blueprint-compiler,
wrapGAppsHook4,
desktop-file-utils,
libadwaita,
libshumate,
alsa-lib,
espeak,
sqlite,
glib-networking,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "jogger";
version = "1.2.4-unstable-2024-04-05";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "baarkerlounger";
repo = "jogger";
rev = "09386b9503a9b996b86ea4638268403868b24d6a";
hash = "sha256-oGjqYRHkYk22/RzDc5c0066SlOPGRGC6z/BTn1DM03o=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) pname version src;
hash = "sha256-+8mMJgLHLUdFLOwjhXolHcVUP+s/j6PlWeRh8sGRYTc=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
cargo
rustc
blueprint-compiler
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
libshumate
alsa-lib
espeak
sqlite
glib-networking
];
meta = {
description = "App for Gnome Mobile to Track running and other workouts";
homepage = "https://codeberg.org/baarkerlounger/jogger";
license = with lib.licenses; [
gpl3Plus
cc0
];
mainProgram = "jogger";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/lo/louvre/package.nix
+15 -9
View File
@@ -19,19 +19,26 @@
, udev
, wayland
, xorgproto
, nix-update-script
}:
stdenv.mkDerivation (self: {
stdenv.mkDerivation (finalAttrs: {
pname = "louvre";
version = "2.2.0-1";
rev = "v${self.version}";
hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568=";
version = "2.9.0-1";
src = fetchFromGitHub {
inherit (self) rev hash;
owner = "CuarzoSoftware";
repo = "Louvre";
rev = "v${finalAttrs.version}";
hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U=";
};
sourceRoot = "${finalAttrs.src.name}/src";
postPatch = ''
substituteInPlace examples/meson.build \
--replace-fail "/usr/local/share/wayland-sessions" "${placeholder "out"}/share/wayland-sessions"
'';
nativeBuildInputs = [
meson
ninja
@@ -58,10 +65,9 @@ stdenv.mkDerivation (self: {
outputs = [ "out" "dev" ];
preConfigure = ''
# The root meson.build file is in src/
cd src
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "C++ library for building Wayland compositors";
pkgs/by-name/mu/mumps/package.nix
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ [
"LSCOTCHDIR=${scotch}/lib"
"ISCOTCH=-I${scotch}/include"
"ISCOTCH=-I${scotch.dev}/include"
"LMETISDIR=${metis}/lib"
"IMETIS=-I${metis}/include"
"allshared"
pkgs/by-name/ol/ollama/package.nix
+14 -25
View File
@@ -2,7 +2,6 @@
lib,
buildGoModule,
fetchFromGitHub,
fetchpatch,
buildEnv,
linkFarm,
overrideCC,
@@ -52,28 +51,6 @@ let
vendorHash = "sha256-hSxcREAujhvzHVNwnRTfhi0MKI3s8HNavER2VLz6SYk=";
# ollama's patches of llama.cpp's example server
# `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream"
# each update, these patches should be synchronized with the contents of `ollama/llm/patches/`
llamacppPatches = [
(preparePatch "01-load-progress.diff" "sha256-UTmnBS5hQjIL3eXDZc8RBDNJunLlkqJWH20LpXNiGRQ=")
(preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=")
(preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=")
(preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=")
(preparePatch "05-default-pretokenizer.diff" "sha256-mxqHnDbiy8yfKFUYryNTj/xay/lx9KDiZAiekFSkxr8=")
(preparePatch "06-embeddings.diff" "sha256-+4yAEAX1JJenOksG2OxDCwiLEoLj1glJQLIgV08BI5Q=")
(preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
];
preparePatch =
patch: hash:
fetchpatch {
url = "file://${src}/llm/patches/${patch}";
inherit hash;
stripLen = 1;
extraPrefix = "llm/llama.cpp/";
};
validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [
"both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "
"but they are mutually exclusive; falling back to cpu"
@@ -174,13 +151,25 @@ goBuild (
# disable uses of `git` in the `go generate` script
# ollama's build script assumes the source is a git repo, but nix removes the git directory
# this also disables necessary patches contained in `ollama/llm/patches/`
# those patches are added to `llamacppPatches`, and reapplied here in the patch phase
# those patches are applied in `postPatch`
./disable-git.patch
] ++ llamacppPatches;
];
postPatch = ''
# replace inaccurate version number with actual release version
substituteInPlace version/version.go --replace-fail 0.0.0 '${version}'
# apply llama.cpp patches
for cur in llm/patches/*; do patch -p1 -d llm/llama.cpp < $cur; done
'';
overrideModAttrs = (
finalAttrs: prevAttrs: {
# don't run llama.cpp build in the module fetch phase
preBuild = "";
}
);
preBuild = ''
# disable uses of `git`, since nix removes the git directory
export OLLAMA_SKIP_PATCHING=true
pkgs/by-name/sc/scotch/package.nix
+10 -2
View File
@@ -14,16 +14,24 @@
stdenv.mkDerivation (finalAttrs: {
pname = "scotch";
version = "7.0.4";
version = "7.0.5";
src = fetchFromGitLab {
domain = "gitlab.inria.fr";
owner = "scotch";
repo = "scotch";
rev = "v${finalAttrs.version}";
hash = "sha256-uaox4Q9pTF1r2BZjvnU2LE6XkZw3x9mGSKLdRVUobGU=";
hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II=";
};
outputs = [
"bin"
"dev"
"out"
];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
nativeBuildInputs = [
cmake
gfortran
pkgs/development/compilers/dart/sources.nix
+6 -6
View File
@@ -1,24 +1,24 @@
let version = "3.5.1"; in
let version = "3.5.2"; in
{ fetchurl }: {
versionUsed = version;
"${version}-x86_64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
sha256 = "18v73dr61033g0x27vb0fdjwyzc1d04fifmwwnv4157nfpb68ijc";
sha256 = "0k1h7kbcagm7s0n8696lzws814rabz3491khd7z78mb3ivahxw35";
};
"${version}-aarch64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
sha256 = "1vjsnwlkvsb0xvap45fdd81vdsjkpl2yxr8xh39v77dxbpybi0qh";
sha256 = "036jw4qq3wicyfpamy7v6qsbrj0m7dyny45yzdgil4snvfagvfsv";
};
"${version}-aarch64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = "0lwnvky3p37d81ib6qwxra7lxn19l5x30c7aycixd9yaslq1bc0v";
sha256 = "1wm1157hbsms872pp1fkn0i3khz3h4r909bdvpk2rhag2l928f0a";
};
"${version}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "0zn2mw8awii0hrvyh146hb5604li0jgxxgavpi19zcdpnzdg6z7c";
sha256 = "160dk1dpdzdh0pphmvdw7agavpyxniw8zf5w30yamkdi7r9g0l0b";
};
"${version}-i686-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "11x7yyif51hyn8yi2lqbkfm3lfalkvh54v5pi851mfdnf14hsjpw";
sha256 = "0nrgjdzc2skqc2b52pzw78056jqrqmiwzwwd9wh699dwwfnrjcf4";
};
}
pkgs/development/compilers/temurin-bin/generate-sources.py
+1
View File
@@ -16,6 +16,7 @@ arch_to_nixos = {
"aarch64": ("aarch64",),
"arm": ("armv6l", "armv7l"),
"ppc64le": ("powerpc64le",),
"riscv64": ("riscv64",),
}
def generate_sources(assets, feature_version, out):
pkgs/development/compilers/temurin-bin/sources.json
+36
View File
@@ -302,6 +302,12 @@
"sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz",
"version": "17.0.11"
},
"riscv64": {
"build": "7",
"sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz",
"version": "17.0.12"
}
},
"openjdk18": {
@@ -414,6 +420,12 @@
"sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz",
"version": "21.0.3"
},
"riscv64": {
"build": "7",
"sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz",
"version": "21.0.4"
}
},
"openjdk22": {
@@ -436,6 +448,12 @@
"sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8",
"url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz",
"version": "22.0.1"
},
"riscv64": {
"build": "9",
"sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389",
"url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz",
"version": "22.0.2"
}
},
"openjdk8": {
@@ -540,6 +558,12 @@
"sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz",
"version": "17.0.11"
},
"riscv64": {
"build": "7",
"sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz",
"version": "17.0.12"
}
},
"openjdk18": {
@@ -652,6 +676,12 @@
"sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz",
"version": "21.0.3"
},
"riscv64": {
"build": "7",
"sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237",
"url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz",
"version": "21.0.4"
}
},
"openjdk22": {
@@ -674,6 +704,12 @@
"sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c",
"url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz",
"version": "22.0.1"
},
"riscv64": {
"build": "9",
"sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c",
"url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz",
"version": "22.0.2"
}
},
"openjdk8": {
pkgs/development/compilers/typescript/default.nix
+3 -3
View File
@@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "typescript";
version = "5.5.4";
version = "5.6.2";
src = fetchFromGitHub {
owner = "microsoft";
repo = "TypeScript";
rev = "v${version}";
hash = "sha256-U4lFR2SJQYqJYptVf3/QMD7ufa3r7Zm704gcwFKM/7s=";
hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris=";
};
patches = [
./disable-dprint-dstBundler.patch
];
npmDepsHash = "sha256-JYNFAOTN0WvYkr20J6tFM1KSIDTm1LlFw7w1bLkdg6k=";
npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc=";
passthru.tests = {
version = testers.testVersion {
pkgs/development/compilers/yosys/default.nix
+3 -3
View File
@@ -75,13 +75,13 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "yosys";
version = "0.44";
version = "0.45";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "refs/tags/yosys-${finalAttrs.version}";
hash = "sha256-aMVWmryMbVlEm1RNj1ENpLHOpuKRQTJMFZCn+WuaR04=";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI=";
fetchSubmodules = true;
leaveDotGit = true;
postFetch = ''
pkgs/development/interpreters/bats/libraries.nix
+1 -1
View File
@@ -58,7 +58,7 @@
owner = "bats-core";
repo = "bats-detik";
rev = "v${finalAttrs.version}";
hash = "sha256-Lz5BPKHtgdakKRALPZFFgz91d07Ubk5rUgA+Ep2aoG8=";
hash = "sha256-f8PN+VsUdUXrR9JiQgVuYDy2QgOtaxE8tkkxOUF0uC4=";
};
dontBuild = true;
installPhase = ''
pkgs/development/libraries/itk/generic.nix
+91 -33
View File
@@ -10,6 +10,8 @@
fetchFromGitHub,
fetchpatch,
cmake,
castxml,
swig,
expat,
fftw,
gdcm,
@@ -20,13 +22,21 @@
libpng,
libX11,
libuuid,
patchelf,
python ? null,
numpy ? null,
xz,
vtk,
which,
zlib,
Cocoa,
enablePython ? false,
}:
let
# Python wrapper contains its own VTK support incompatible with MODULE_ITKVtkGlue
withVtk = !enablePython;
itkGenericLabelInterpolatorSrc = fetchFromGitHub {
owner = "InsightSoftwareConsortium";
repo = "ITKGenericLabelInterpolator";
@@ -47,6 +57,19 @@ let
rev = "bb896868fc6480835495d0da4356d5db009592a6";
hash = "sha256-MfaIA0xxA/pzUBSwnAevr17iR23Bo5iQO2cSyknS3o4=";
};
# remove after next swig update:
swigUnstable = swig.overrideAttrs ({
version = "4.2.1-unstable-2024-08-19";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
rev = "5ac5d90f970759fbe705fae551d0743a7c63c67e";
hash = "sha256-32EFLHpP4l04nqrc8dt4Qsr8deTBqLt8lUlhnNnaIGU=";
};
});
in
stdenv.mkDerivation {
@@ -77,39 +100,56 @@ stdenv.mkDerivation {
ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters
'';
cmakeFlags = [
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_SHARED_LIBS=ON"
"-DITK_FORBID_DOWNLOADS=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc.
# note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES,
# causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory"
# when compiling c3d, but maybe an ITK 5.2/eigen version issue:
"-DITK_USE_SYSTEM_EIGEN=OFF"
"-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489
"-DITK_USE_SYSTEM_GDCM=ON"
"-DITK_USE_SYSTEM_MINC=ON"
"-DLIBMINC_DIR=${libminc}/lib/cmake"
"-DModule_ITKMINC=ON"
"-DModule_ITKIOMINC=ON"
"-DModule_ITKIOTransformMINC=ON"
"-DModule_SimpleITKFilters=ON"
"-DModule_ITKVtkGlue=ON"
"-DModule_ITKReview=ON"
"-DModule_MGHIO=ON"
"-DModule_AdaptiveDenoising=ON"
"-DModule_GenericLabelInterpolator=ON"
];
cmakeFlags =
[
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_SHARED_LIBS=ON"
"-DITK_FORBID_DOWNLOADS=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc.
# note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES,
# causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory"
# when compiling c3d, but maybe an ITK 5.2/eigen version issue:
"-DITK_USE_SYSTEM_EIGEN=OFF"
"-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489
"-DITK_USE_SYSTEM_GDCM=ON"
"-DITK_USE_SYSTEM_MINC=ON"
"-DLIBMINC_DIR=${libminc}/lib/cmake"
"-DModule_ITKMINC=ON"
"-DModule_ITKIOMINC=ON"
"-DModule_ITKIOTransformMINC=ON"
"-DModule_SimpleITKFilters=ON"
"-DModule_ITKReview=ON"
"-DModule_MGHIO=ON"
"-DModule_AdaptiveDenoising=ON"
"-DModule_GenericLabelInterpolator=ON"
]
++ lib.optionals enablePython [
"-DITK_WRAP_PYTHON=ON"
"-DITK_USE_SYSTEM_CASTXML=ON"
"-DITK_USE_SYSTEM_SWIG=ON"
"-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}"
]
++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ];
nativeBuildInputs = [
cmake
xz
];
buildInputs = [
libX11
libuuid
vtk
] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
nativeBuildInputs =
[
cmake
xz
]
++ lib.optionals enablePython [
castxml
swigUnstable
which
];
buildInputs =
[
libX11
libuuid
]
++ lib.optionals stdenv.isDarwin [ Cocoa ]
++ lib.optionals enablePython [ python ]
++ lib.optionals withVtk [ vtk ];
# Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9
# (specifically libGL and libX11 on Linux),
# it's now seemingly necessary for packages that configure ITK to
@@ -130,12 +170,30 @@ stdenv.mkDerivation {
libpng
libtiff
zlib
] ++ vtk.propagatedBuildInputs;
] ++ lib.optionals withVtk vtk.propagatedBuildInputs ++ lib.optionals enablePython [ numpy ];
postInstall = lib.optionalString enablePython ''
substitute \
${./itk.egg-info} \
$out/${python.sitePackages}/itk-${version}.egg-info \
--subst-var-by ITK_VER "${version}"
'';
# remove forbidden reference to /build which occur when building the Python wrapping
# (also remove a copy of itkTestDriver with incorrect permissions/RPATH):
preFixup = lib.optionals enablePython ''
rm $out/${python.sitePackages}/itk/itkTestDriver
find $out/${python.sitePackages}/itk -type f -name '*.so*' -exec \
patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \;
'';
meta = {
description = "Insight Segmentation and Registration Toolkit";
homepage = "https://www.itk.org";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bcdarwin ];
# aarch64-linux Python wrapping fails with "error: unknown type name '_Float128'" and similar;
# compilation runs slowly and times out on Darwin
platforms = with lib.platforms; if enablePython then [ "x86_64-linux" ] else unix;
};
}
pkgs/development/libraries/itk/itk.egg-info
+5
View File
@@ -0,0 +1,5 @@
Metadata-Version: 2.1
Name: itk
Version: @ITK_VER@
Summary: Insight Segmentation and Registration Toolkit
Platform: UNKNOWN
pkgs/development/libraries/libgda/6.x.nix
+2
View File
@@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
postgresql
];
env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
postPatch = ''
patchShebangs \
providers/raw_spec.py \
pkgs/development/libraries/libgda/default.nix
+2
View File
@@ -82,6 +82,8 @@ stdenv.mkDerivation rec {
"--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}"
];
env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
pkgs/development/libraries/libgee/default.nix
+1
View File
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
env = {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
};
pkgs/development/libraries/waylib/default.nix
+5
View File
@@ -42,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
"${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png"
'';
depsBuildBuild = [
# To find wayland-scanner
pkg-config
];
nativeBuildInputs = [
cmake
pkg-config
pkgs/development/python-modules/desktop-notifier/default.nix
+10 -6
View File
@@ -4,31 +4,35 @@
fetchFromGitHub,
pythonOlder,
stdenv,
bidict,
packaging,
setuptools,
dbus-next,
dbus-fast,
rubicon-objc,
}:
buildPythonPackage rec {
pname = "desktop-notifier";
version = "5.0.1";
version = "6.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SamSchott";
repo = pname;
repo = "desktop-notifier";
rev = "refs/tags/v${version}";
hash = "sha256-A+25T0xgUcE1NaOKNZgeP80VlEmqa137YGn3g/pwpxM=";
hash = "sha256-HynREkiPxv/1y1/ICVwqANIe9tAkIvdpDy4oXxQarec=";
};
build-system = [ setuptools ];
dependencies =
[ packaging ]
++ lib.optionals stdenv.isLinux [ dbus-next ]
[
bidict
packaging
]
++ lib.optionals stdenv.isLinux [ dbus-fast ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ];
# no tests available, do the imports check instead
pkgs/development/python-modules/jedi/default.nix
+8
View File
@@ -61,6 +61,14 @@ buildPythonPackage rec {
++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [
# AssertionError: assert 'foo' in ['setup']
"test_init_extension_module"
]
++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
# InvalidPythonEnvironment: The python binary is potentially unsafe.
"test_create_environment_executable"
# AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
"test_dict_keys_completions"
# AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
"test_dict_completion"
];
meta = with lib; {
pkgs/development/python-modules/noise/default.nix
+15 -4
View File
@@ -2,22 +2,33 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools,
pythonOlder,
}:
buildPythonPackage rec {
pname = "noise";
version = "1.2.2";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp";
hash = "sha256-V6J5dDZXQ5H/Y6ER6FLlOkFk7Nga0jY5ZBdDzRogm2U=";
};
build-system = [ setuptools ];
# PyPI release don't contain tests
doCheck = false;
pythonImportsCheck = [ "noise" ];
meta = with lib; {
homepage = "https://github.com/caseman/noise";
description = "Native-code and shader implementations of Perlin noise";
homepage = "https://github.com/caseman/noise";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ ];
};
}
pkgs/development/python-modules/osprofiler/default.nix
+5 -2
View File
@@ -4,6 +4,7 @@
fetchPypi,
netaddr,
oslo-concurrency,
oslo-config,
oslo-serialization,
oslo-utils,
prettytable,
@@ -14,12 +15,12 @@
buildPythonPackage rec {
pname = "osprofiler";
version = "4.1.0";
version = "4.2.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-V4N7YgWBsTREouIFZHddT8c+/2fHiIr5mUftWC/lFLA=";
hash = "sha256-bdHEviZFqPJBIQVdpbtGFojcr8fmtNS6vA7xumaQJ4E=";
};
build-system = [ setuptools ];
@@ -27,6 +28,7 @@ buildPythonPackage rec {
dependencies = [
netaddr
oslo-concurrency
oslo-config
oslo-serialization
oslo-utils
prettytable
@@ -46,6 +48,7 @@ buildPythonPackage rec {
description = "OpenStack Library to profile request between all involved services";
homepage = "https://opendev.org/openstack/osprofiler/";
license = licenses.asl20;
mainProgram = "osprofiler";
maintainers = teams.openstack.members;
};
}
pkgs/development/python-modules/python-octaviaclient/default.nix
+2 -2
View File
@@ -28,12 +28,12 @@
buildPythonPackage rec {
pname = "python-octaviaclient";
version = "3.7.0";
version = "3.8.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-wAGxByeRBOwdWZg2DwVpt1yGi5er3KQ/qhyRVAwaKe4=";
hash = "sha256-wrYhCY3gqcklSK8lapsgFq25Yi3awEGgarW2a7W1kO4=";
};
build-system = [
pkgs/development/python-modules/python-openstackclient/default.nix
+2 -2
View File
@@ -28,12 +28,12 @@
buildPythonPackage rec {
pname = "python-openstackclient";
version = "7.0.0";
version = "7.1.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-1HDjWYySnZI/12j9+Gb1G9NKkb+xfrcMoTY/q7aL0uA=";
hash = "sha256-nv/CmcVpQiC65Fd3jmzZsjrqG8O/zQTjoE+NhjhaBVQ=";
};
build-system = [
pkgs/development/python-modules/swift/default.nix
+12 -10
View File
@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "swift";
version = "2.33.0";
format = "setuptools";
version = "2.34.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-4TlJcquK8MC9zQfLKmb88B5xHje1kbPD2jSLiR+N8hs=";
hash = "sha256-ZvdWWvPUdZIEadxV0nhqgTXhgJJu+hD1LnYCAP+9gpM=";
};
postPatch = ''
@@ -38,9 +38,11 @@ buildPythonPackage rec {
rm test/functional/s3api/{__init__.py,s3_test_client.py}
'';
nativeBuildInputs = [
installShellFiles
nativeBuildInputs = [ installShellFiles ];
build-system = [
pbr
setuptools
];
propagatedBuildInputs = [
@@ -57,17 +59,17 @@ buildPythonPackage rec {
xattr
];
postInstall = ''
installManPage doc/manpages/*
'';
nativeCheckInputs = [
dependencies = [
boto3
mock
stestr
swiftclient
];
postInstall = ''
installManPage doc/manpages/*
'';
# a lot of tests currently fail while establishing a connection
doCheck = false;
pkgs/development/python-modules/tcolorpy/default.nix
+12 -3
View File
@@ -3,20 +3,29 @@
fetchFromGitHub,
lib,
pytestCheckHook,
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "tcolorpy";
version = "0.1.4";
format = "setuptools";
version = "0.1.6";
pyproject = true;
src = fetchFromGitHub {
owner = "thombashi";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-cCdKeixRfXkvEGBqozMWw2RjliLdzhlMv8GE2Q40LZQ=";
hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w=";
};
build-system = [
setuptools
setuptools-scm
];
pythonImportsCheck = [ "tcolorpy" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
pkgs/development/python-modules/tempest/default.nix
+32 -29
View File
@@ -1,78 +1,80 @@
{
lib,
bash,
buildPythonPackage,
cliff,
debtcollector,
defusedxml,
fetchPypi,
pbr,
cliff,
fixtures,
hacking,
jsonschema,
testtools,
paramiko,
netaddr,
oslo-concurrency,
oslo-config,
oslo-log,
stestr,
oslo-serialization,
oslo-utils,
fixtures,
oslotest,
paramiko,
pbr,
prettytable,
python,
pythonOlder,
pyyaml,
subunit,
stevedore,
prettytable,
urllib3,
debtcollector,
hacking,
oslotest,
bash,
python,
setuptools,
stestr,
stevedore,
subunit,
testscenarios,
testtools,
urllib3,
}:
buildPythonPackage rec {
pname = "tempest";
version = "39.0.0";
version = "40.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-l4qKbTfQRWiRsoHN9fiAAiGMGP+q3gwRH1pMSXV/eSU=";
hash = "sha256-s2EvD1TDoRoKrvpRc6h3P7xRyT941nW1hveucXDLB4w=";
};
pythonRelaxDeps = [ "defusedxml" ];
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
pbr
dependencies = [
cliff
debtcollector
defusedxml
fixtures
jsonschema
testtools
paramiko
netaddr
oslo-concurrency
oslo-config
oslo-log
stestr
oslo-serialization
oslo-utils
fixtures
pyyaml
subunit
stevedore
paramiko
pbr
prettytable
pyyaml
stestr
stevedore
subunit
testscenarios
testtools
urllib3
debtcollector
];
nativeCheckInputs = [
stestr
hacking
oslotest
stestr
];
checkPhase = ''
@@ -94,6 +96,7 @@ buildPythonPackage rec {
description = "OpenStack integration test suite that runs against live OpenStack cluster and validates an OpenStack deployment";
homepage = "https://github.com/openstack/tempest";
license = licenses.asl20;
mainProgram = "tempest";
maintainers = teams.openstack.members;
};
}
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1230";
version = "3.0.1231";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-wuEbocPbQL/oG6b78Q92+kfWP3ZkIIf8k97tSBZg9nc=";
hash = "sha256-XDFAUIP/oA71dK+QMUrh9ZmusJFzrpuI+0ExW+A6FIU=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/tensorflow-probability/default.nix
+42 -30
View File
@@ -1,34 +1,45 @@
{
lib,
stdenv,
fetchFromGitHub,
bazel_6,
# bazel wheel
buildBazelPackage,
buildPythonPackage,
cctools,
fetchFromGitHub,
# nativeBuildInputs
python,
setuptools,
wheel,
absl-py,
tensorflow,
six,
numpy,
dm-tree,
keras,
decorator,
bazel_6,
cctools,
# python package
buildPythonPackage,
# dependencies
cloudpickle,
decorator,
dm-tree,
gast,
keras,
numpy,
six,
tensorflow,
# tests
hypothesis,
scipy,
pandas,
mpmath,
matplotlib,
mock,
mpmath,
pandas,
pytest,
scipy,
}:
let
version = "0.21.0";
version = "0.24.0";
pname = "tensorflow-probability";
# first build all binaries and generate setup.py using bazel
@@ -38,15 +49,15 @@ let
owner = "tensorflow";
repo = "probability";
rev = "refs/tags/v${version}";
hash = "sha256-DsJd1E5n86xNS7Ci0DXxoUxQ9jH8OwTZq2UuLlQtMUU=";
hash = "sha256-V6aw4NtGOHlvcbgLWMH29x81eck1PyzV93ANelvpL4c=";
};
nativeBuildInputs = [
absl-py
# needed to create the output wheel in installPhase
python
setuptools
wheel
absl-py
tensorflow
wheel
];
bazel = bazel_6;
@@ -83,27 +94,27 @@ buildPythonPackage {
src = bazel-wheel;
propagatedBuildInputs = [
tensorflow
six
numpy
decorator
dependencies = [
cloudpickle
gast
decorator
dm-tree
gast
keras
numpy
six
tensorflow
];
# Listed here:
# https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83
nativeCheckInputs = [
hypothesis
pytest
scipy
pandas
mpmath
matplotlib
mock
mpmath
pandas
pytest
scipy
];
# Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available.
@@ -114,10 +125,11 @@ buildPythonPackage {
# sanity check
pythonImportsCheck = [ "tensorflow_probability" ];
meta = with lib; {
meta = {
description = "Library for probabilistic reasoning and statistical analysis";
homepage = "https://www.tensorflow.org/probability/";
license = licenses.asl20;
maintainers = with maintainers; [ GaetanLepage ];
changelog = "https://github.com/tensorflow/probability/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
pkgs/development/tools/rain/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "rain";
version = "1.12.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oj9/xVbb8+J4g/ul2CEs5LH7OKJdEqTTZonCHVlDc7M=";
sha256 = "sha256-B+LSwZ1AugYhMlt1XcG8i8SIORO0vFMUxJrF6z3Crus=";
};
vendorHash = "sha256-NcM+SdIgqtSRg7Fcwml/V73qYHcowBdOtmuF7EMSBB8=";
vendorHash = "sha256-JTKoEuO3D+/MO7FeSu1tiVqERkQiu2nG/KiEth1ylG0=";
subPackages = [ "cmd/rain" ];
pkgs/development/web/flyctl/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.2.125";
version = "0.3.1";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-7jMti/NShvo6T3JLzRM9FKqRXkgS8jeUitZq5SU4sHE=";
hash = "sha256-5P6B52ekrAupoQh2K3LhC4ydwuKOTPfpjOVlGiDxQb0=";
};
vendorHash = "sha256-uYGOXXeNfe2rYtJh2ggNv2TbVJul4RbiBQ1KSbEjqW8=";
vendorHash = "sha256-QfequNmKLbZqMKcwhRXKaTflQYWKu8ucjaGcBM7Jn6g=";
subPackages = [ "." ];
pkgs/servers/nextcloud/default.nix
+4 -4
View File
@@ -42,14 +42,14 @@ let
};
in {
nextcloud28 = generic {
version = "28.0.9";
hash = "sha256-DZd3NkDn+A6gqTP7+L0pe/JB2ghy+hzFQ1D/F5Nmmxs=";
version = "28.0.10";
hash = "sha256-LoAVJtKJHBhf6sWYXL084pLOcKQl9Tb5GfkBuftMwhA=";
packages = nextcloud28Packages;
};
nextcloud29 = generic {
version = "29.0.6";
hash = "sha256-3GC+A/0X4wuv7ypNT+stCWqnekxrTyHJhXYOU3+EAeM=";
version = "29.0.7";
hash = "sha256-9TL/wxvlqDdLXgcrhv/4dl7Bn9oMhQnO45hzCB2yxUQ=";
packages = nextcloud29Packages;
};
pkgs/servers/nextcloud/packages/28.json
+17 -17
View File
@@ -1,8 +1,8 @@
{
"bookmarks": {
"hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz",
"version": "14.2.4",
"hash": "sha256-ZWdz7Hl3wrTEHrXdOsPKRcE5GAnHYHjudbY5F0VjG4Y=",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.5/bookmarks-14.2.5.tar.gz",
"version": "14.2.5",
"description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0",
"homepage": "https://github.com/nextcloud/bookmarks",
"licenses": [
@@ -90,10 +90,10 @@
]
},
"groupfolders": {
"hash": "sha256-AMhhpzznCMW6vHc5vHkP4/wWY+NcqSvB/ZTVj2U6peM=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.8/groupfolders-v16.0.8.tar.gz",
"version": "16.0.8",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
"hash": "sha256-PtxAidIono2roSVA/VLQZ13TVcqWZL069eXpY+npFB8=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.9/groupfolders-v16.0.9.tar.gz",
"version": "16.0.9",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
"agpl"
@@ -160,10 +160,10 @@
]
},
"music": {
"hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=",
"url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz",
"version": "2.0.0",
"description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone",
"hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=",
"url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz",
"version": "2.0.1",
"description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone",
"homepage": "https://github.com/owncloud/music",
"licenses": [
"agpl"
@@ -210,9 +210,9 @@
]
},
"polls": {
"hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=",
"url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz",
"version": "7.2.1",
"hash": "sha256-TBCNr57MKEe8OSXEqWohZH9zuCwFTMDnwnZ1nFZ+FWY=",
"url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.2/polls-v7.2.2.tar.gz",
"version": "7.2.2",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls",
"licenses": [
@@ -310,9 +310,9 @@
]
},
"unsplash": {
"hash": "sha256-xfu5m5VOZZ9ATnRg44sw/MTEXitrDFCuAcm+siNilsY=",
"url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.0/unsplash.tar.gz",
"version": "3.0.0",
"hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=",
"url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz",
"version": "3.0.1",
"description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!",
"homepage": "https://github.com/nextcloud/unsplash/",
"licenses": [
pkgs/servers/nextcloud/packages/29.json
+32 -22
View File
@@ -1,8 +1,8 @@
{
"bookmarks": {
"hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz",
"version": "14.2.4",
"hash": "sha256-ZWdz7Hl3wrTEHrXdOsPKRcE5GAnHYHjudbY5F0VjG4Y=",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.5/bookmarks-14.2.5.tar.gz",
"version": "14.2.5",
"description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0",
"homepage": "https://github.com/nextcloud/bookmarks",
"licenses": [
@@ -90,10 +90,10 @@
]
},
"groupfolders": {
"hash": "sha256-cWWlvuUTO4B89CDZzfJLN8MRmQwPMwj0OwFqhIUxAsQ=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.2/groupfolders-v17.0.2.tar.gz",
"version": "17.0.2",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
"hash": "sha256-fdFxsUwXM8nqb7m4pWtQVGq0SLf0zWBuyxFrzppevYI=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.3/groupfolders-v17.0.3.tar.gz",
"version": "17.0.3",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
"agpl"
@@ -140,8 +140,8 @@
]
},
"maps": {
"hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=",
"url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz",
"hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=",
"url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz",
"version": "1.4.0",
"description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
"homepage": "https://github.com/nextcloud/maps",
@@ -160,10 +160,10 @@
]
},
"music": {
"hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=",
"url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz",
"version": "2.0.0",
"description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone",
"hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=",
"url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz",
"version": "2.0.1",
"description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone",
"homepage": "https://github.com/owncloud/music",
"licenses": [
"agpl"
@@ -210,9 +210,9 @@
]
},
"polls": {
"hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=",
"url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz",
"version": "7.2.1",
"hash": "sha256-TBCNr57MKEe8OSXEqWohZH9zuCwFTMDnwnZ1nFZ+FWY=",
"url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.2/polls-v7.2.2.tar.gz",
"version": "7.2.2",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls",
"licenses": [
@@ -250,9 +250,9 @@
]
},
"richdocuments": {
"hash": "sha256-kAY1Y4PB7AIFWNx+Yi1ovZopGEER/r5RveIlS/y6Veo=",
"url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.5/richdocuments-v8.4.5.tar.gz",
"version": "8.4.5",
"hash": "sha256-S1ORUIx+rcA4UUFmPX4KiLakzPPIqvVmcABDuNX0tys=",
"url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.6/richdocuments-v8.4.6.tar.gz",
"version": "8.4.6",
"description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
"homepage": "https://collaboraoffice.com/",
"licenses": [
@@ -260,9 +260,9 @@
]
},
"spreed": {
"hash": "sha256-/WD/UAtuLYdtZjBNIur2qRaPNXGTG1lfPTOlJpZfyCI=",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.8/spreed-v19.0.8.tar.gz",
"version": "19.0.8",
"hash": "sha256-cZYE528jSNnPFgJSnqosoPyo/7V3zdUAIxnFpcOuvh4=",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz",
"version": "19.0.9",
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
"homepage": "https://github.com/nextcloud/spreed",
"licenses": [
@@ -309,6 +309,16 @@
"agpl"
]
},
"unsplash": {
"hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=",
"url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz",
"version": "3.0.1",
"description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!",
"homepage": "https://github.com/nextcloud/unsplash/",
"licenses": [
"agpl"
]
},
"user_oidc": {
"hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=",
"url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz",
pkgs/shells/zsh/zinit/default.nix
+2
View File
@@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation rec {
install -m0644 zinit{,-side,-install,-autoload}.zsh "$outdir"
install -m0755 share/git-process-output.zsh "$outdir"
installManPage doc/zinit.1
# Zplugin autocompletion
installShellCompletion --zsh _zinit
pkgs/tools/X11/xdg-utils/default.nix
+1 -13
View File
@@ -5,17 +5,9 @@
, resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, nettools, procmail, procps, which, xdg-user-dirs
, shared-mime-info
, perl, perlPackages
, mimiSupport ? false
, withXdgOpenUsePortalPatch ? true }:
let
# A much better xdg-open
mimisrc = fetchFromGitHub {
owner = "march-linux";
repo = "mimi";
rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d";
sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj";
};
# Required by the common desktop detection code
commonDeps = [ dbus coreutils gnugrep gnused ];
@@ -268,10 +260,6 @@ stdenv.mkDerivation (self: {
# explicitly provide a runtime shell so patchShebangs is consistent across build platforms
buildInputs = [ bash ];
postInstall = lib.optionalString mimiSupport ''
cp ${mimisrc}/xdg-open $out/bin/xdg-open
'';
preFixup = lib.concatStringsSep "\n" (map (resholve.phraseSolution "xdg-utils-resholved") solutions);
passthru.tests.xdg-mime = runCommand "xdg-mime-test" {
@@ -305,7 +293,7 @@ stdenv.mkDerivation (self: {
meta = with lib; {
homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/";
description = "Set of command line tools that assist applications with a variety of desktop integration tasks";
license = if mimiSupport then licenses.gpl2Only else licenses.mit;
license = licenses.mit;
maintainers = [ ];
platforms = platforms.all;
};
pkgs/tools/graphics/netpbm/default.nix
+3 -3
View File
@@ -20,14 +20,14 @@ stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
pname = "netpbm";
version = "11.7.0";
version = "11.7.1";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "4925";
sha256 = "Y6o/9nq9ICqlKCDh59eiT38CZ+cfB1ezb8arF0uBYsk=";
rev = "4932";
sha256 = "bmPqUPOlkQ0vKim+t8ct2ErFU4uWw6L5foODGWrrExs=";
};
nativeBuildInputs = [
pkgs/tools/networking/socat/default.nix
+2 -2
View File
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "socat";
version = "1.8.0.0";
version = "1.8.0.1";
src = fetchurl {
url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2";
hash = "sha256-4d5oPdIu4OOmxrv/Jpq+GKsMnX62UCBPElFVuQBfrKc=";
hash = "sha256-aig1Zdt8+GKSxvcFBMWKuwPimIit7tWmxfNFfoA8G4E=";
};
postPatch = ''
pkgs/tools/system/netdata/default.nix
+162 -87
View File
@@ -1,36 +1,71 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper
, CoreFoundation, IOKit, libossp_uuid
, nixosTests
, bash, curl, jemalloc, json_c, libuv, zlib, libyaml, libelf, libbpf
, libcap, libuuid, lm_sensors, protobuf
, go, buildGoModule, ninja
, withCups ? false, cups
, withDBengine ? true, lz4
, withIpmi ? (!stdenv.isDarwin), freeipmi
, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct
, withCloud ? false
, withCloudUi ? false
, withConnPubSub ? false, google-cloud-cpp, grpc
, withConnPrometheus ? false, snappy
, withSsl ? true, openssl
, withSystemdJournal ? (!stdenv.isDarwin), systemd
, withDebug ? false
, withEbpf ? false
, withNetworkViewer ? (!stdenv.isDarwin)
{
lib,
stdenv,
fetchFromGitHub,
bash,
buildGoModule,
cmake,
cups,
curl,
darwin,
freeipmi,
go,
google-cloud-cpp,
grpc,
jemalloc,
json_c,
libbpf,
libcap,
libelf,
libmnl,
libnetfilter_acct,
libossp_uuid,
libuuid,
libuv,
libyaml,
lm_sensors,
lz4,
makeWrapper,
ninja,
nixosTests,
openssl,
overrideSDK,
pkg-config,
protobuf,
snappy,
systemd,
withCloud ? false,
withCloudUi ? false,
withConnPrometheus ? false,
withConnPubSub ? false,
withCups ? false,
withDBengine ? true,
withDebug ? false,
withEbpf ? false,
withIpmi ? (stdenv.isLinux),
withNetfilter ? (stdenv.isLinux),
withNetworkViewer ? (stdenv.isLinux),
withSsl ? true,
withSystemdJournal ? (stdenv.isLinux),
zlib,
}:
stdenv.mkDerivation rec {
version = "1.47.0";
let
stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
version = "1.47.1";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
hash = if withCloudUi
then "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I="
rev = "v${finalAttrs.version}";
hash =
if withCloudUi then
"sha256-/iXmIjWpZ0s/LELZM7rYYQ9cjLNdfdisyOvDyLddSY4="
# we delete the v2 GUI after fetching
else "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0=";
else
"sha256-pAqxxsWYgqbmF6wFBfTCYYc3x/Ufyz2Xs4bwB1ToHjo=";
fetchSubmodules = true;
# Remove v2 dashboard distributed under NCUL1. Make sure an empty
@@ -43,19 +78,53 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ]
++ lib.optionals withCups [ cups.dev ];
nativeBuildInputs = [
cmake
pkg-config
makeWrapper
go
ninja
] ++ lib.optionals withCups [ cups.dev ];
# bash is only used to rewrite shebangs
buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml lm_sensors ]
++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ]
buildInputs =
[
bash
curl
jemalloc
json_c
libuv
zlib
libyaml
]
++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
[
CoreFoundation
IOKit
libossp_uuid
]
)
++ lib.optionals (stdenv.isLinux) [
libcap
libuuid
lm_sensors
]
++ lib.optionals withCups [ cups ]
++ lib.optionals withDBengine [ lz4 ]
++ lib.optionals withIpmi [ freeipmi ]
++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ]
++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ]
++ lib.optionals withNetfilter [
libmnl
libnetfilter_acct
]
++ lib.optionals withConnPubSub [
google-cloud-cpp
grpc
]
++ lib.optionals withConnPrometheus [ snappy ]
++ lib.optionals withEbpf [ libelf libbpf ]
++ lib.optionals withEbpf [
libelf
libbpf
]
++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ]
++ lib.optionals withSystemdJournal [ systemd ]
++ lib.optionals withSsl [ openssl ];
@@ -79,40 +148,42 @@ stdenv.mkDerivation rec {
donStrip = withDebug;
env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
postInstall = ''
# Relocate one folder above.
mv $out/usr/* $out/
'' + lib.optionalString (!stdenv.isDarwin) ''
# rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \
$out/libexec/netdata/plugins.d/apps.plugin.org
mv $out/libexec/netdata/plugins.d/cgroup-network \
$out/libexec/netdata/plugins.d/cgroup-network.org
mv $out/libexec/netdata/plugins.d/perf.plugin \
$out/libexec/netdata/plugins.d/perf.plugin.org
mv $out/libexec/netdata/plugins.d/slabinfo.plugin \
$out/libexec/netdata/plugins.d/slabinfo.plugin.org
mv $out/libexec/netdata/plugins.d/debugfs.plugin \
$out/libexec/netdata/plugins.d/debugfs.plugin.org
${lib.optionalString withSystemdJournal ''
mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \
$out/libexec/netdata/plugins.d/systemd-journal.plugin.org
''}
${lib.optionalString withIpmi ''
mv $out/libexec/netdata/plugins.d/freeipmi.plugin \
$out/libexec/netdata/plugins.d/freeipmi.plugin.org
''}
${lib.optionalString withNetworkViewer ''
mv $out/libexec/netdata/plugins.d/network-viewer.plugin \
$out/libexec/netdata/plugins.d/network-viewer.plugin.org
''}
${lib.optionalString (!withCloudUi) ''
rm -rf $out/share/netdata/web/index.html
cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html
''}
'';
postInstall =
''
# Relocate one folder above.
mv $out/usr/* $out/
''
+ lib.optionalString (stdenv.isLinux) ''
# rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \
$out/libexec/netdata/plugins.d/apps.plugin.org
mv $out/libexec/netdata/plugins.d/cgroup-network \
$out/libexec/netdata/plugins.d/cgroup-network.org
mv $out/libexec/netdata/plugins.d/perf.plugin \
$out/libexec/netdata/plugins.d/perf.plugin.org
mv $out/libexec/netdata/plugins.d/slabinfo.plugin \
$out/libexec/netdata/plugins.d/slabinfo.plugin.org
mv $out/libexec/netdata/plugins.d/debugfs.plugin \
$out/libexec/netdata/plugins.d/debugfs.plugin.org
${lib.optionalString withSystemdJournal ''
mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \
$out/libexec/netdata/plugins.d/systemd-journal.plugin.org
''}
${lib.optionalString withIpmi ''
mv $out/libexec/netdata/plugins.d/freeipmi.plugin \
$out/libexec/netdata/plugins.d/freeipmi.plugin.org
''}
${lib.optionalString withNetworkViewer ''
mv $out/libexec/netdata/plugins.d/network-viewer.plugin \
$out/libexec/netdata/plugins.d/network-viewer.plugin.org
''}
${lib.optionalString (!withCloudUi) ''
rm -rf $out/share/netdata/web/index.html
cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html
''}
'';
preConfigure = lib.optionalString (!stdenv.isDarwin) ''
preConfigure = ''
export GOCACHE=$TMPDIR/go-cache
export GOPATH=$TMPDIR/go
export GOSUMDB=off
@@ -120,7 +191,7 @@ stdenv.mkDerivation rec {
substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \
--replace-fail \
'GOPROXY=https://proxy.golang.org' \
'GOPROXY=file://${passthru.netdata-go-modules}'
'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules}'
# Prevent the path to be caught into the Nix store path.
substituteInPlace CMakeLists.txt \
@@ -174,37 +245,41 @@ stdenv.mkDerivation rec {
enableParallelBuild = true;
passthru = rec {
netdata-go-modules = (buildGoModule {
pname = "netdata-go-plugins";
inherit version src;
netdata-go-modules =
(buildGoModule {
pname = "netdata-go-plugins";
inherit (finalAttrs) version src;
sourceRoot = "${src.name}/src/go/plugin/go.d";
sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d";
vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0=";
doCheck = false;
proxyVendor = true;
vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0=";
doCheck = false;
proxyVendor = true;
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
ldflags = [
"-s"
"-w"
"-X main.version=${finalAttrs.version}"
];
passthru.tests = tests;
meta = meta // {
description = "Netdata orchestrator for data collection modules written in Go";
mainProgram = "godplugin";
license = lib.licenses.gpl3Only;
};
}).goModules;
passthru.tests = tests;
meta = finalAttrs.meta // {
description = "Netdata orchestrator for data collection modules written in Go";
mainProgram = "godplugin";
license = lib.licenses.gpl3Only;
};
}).goModules;
inherit withIpmi withNetworkViewer;
tests.netdata = nixosTests.netdata;
};
meta = with lib; {
broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform || withEbpf;
broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf;
description = "Real-time performance monitoring tool";
homepage = "https://www.netdata.cloud/";
changelog = "https://github.com/netdata/netdata/releases/tag/v${version}";
license = [ licenses.gpl3Plus ]
++ lib.optionals (withCloudUi) [ licenses.ncul1 ];
license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ];
platforms = platforms.unix;
maintainers = [ ];
};
}
})
pkgs/top-level/all-packages.nix
-1
View File
@@ -9664,7 +9664,6 @@ with pkgs;
nerdctl = callPackage ../applications/networking/cluster/nerdctl { };
netdata = callPackage ../tools/system/netdata {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
protobuf = protobuf_21;
};
netdataCloud = netdata.override {
pkgs/top-level/python-packages.nix
+7 -1
View File
@@ -6230,6 +6230,12 @@ self: super: with self; {
itanium-demangler = callPackage ../development/python-modules/itanium-demangler { };
itk = toPythonModule (pkgs.itk.override {
inherit python numpy;
enablePython = true;
});
item-synchronizer = callPackage ../development/python-modules/item-synchronizer { };
itemadapter = callPackage ../development/python-modules/itemadapter { };
@@ -14199,7 +14205,7 @@ self: super: with self; {
simplehound = callPackage ../development/python-modules/simplehound { };
simpleitk = callPackage ../development/python-modules/simpleitk {
inherit (pkgs) simpleitk;
inherit (pkgs) itk simpleitk;
};
simplejson = callPackage ../development/python-modules/simplejson { };