Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5fb2bcd3dd
30 changed files with 305 additions and 142 deletions
|
|
@ -1,48 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blockbench-electron";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage";
|
||||
sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share/${pname} $out/share/applications
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/blockbench.desktop $out/share/applications/${pname}.desktop
|
||||
cp -a ${appimageContents}/usr/share/icons $out/share
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A boxy 3D model editor powered by Electron";
|
||||
homepage = "https://blockbench.net/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt
|
||||
cp -r ./dist/linux-unpacked $out/opt/Whalebird
|
||||
cp -r ./dist/*-unpacked $out/opt/Whalebird
|
||||
|
||||
# Install icons
|
||||
# Taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=whalebird#n41
|
||||
|
|
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Single-column Fediverse client for desktop";
|
||||
homepage = "https://whalebird.social";
|
||||
sourceProvenance = with sourceTypes; [ fromSource ];
|
||||
changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ wolfangaukang colinsane weathercold ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
|
|
|
|||
|
|
@ -325,6 +325,12 @@ stdenv.mkDerivation {
|
|||
hardening_unsupported_flags+=" relro bindnow"
|
||||
''
|
||||
|
||||
+ optionalString (libc != null && targetPlatform.isAvr) ''
|
||||
for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
|
||||
echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags
|
||||
done
|
||||
''
|
||||
|
||||
+ optionalString stdenv.targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
|
||||
''
|
||||
|
|
|
|||
|
|
@ -688,6 +688,12 @@ stdenv.mkDerivation {
|
|||
hardening_unsupported_flags+=" stackprotector"
|
||||
''
|
||||
|
||||
+ optionalString (libc != null && targetPlatform.isAvr) ''
|
||||
for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
|
||||
echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-crt1-cflags
|
||||
done
|
||||
''
|
||||
|
||||
+ optionalString stdenv.targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
|
|
|||
87
pkgs/by-name/bl/blockbench/package.nix
Normal file
87
pkgs/by-name/bl/blockbench/package.nix
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, imagemagick
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, electron_28
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_28;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "blockbench";
|
||||
version = "4.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JannisX11";
|
||||
repo = "blockbench";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z4hr1pQh7Jp/DB8+pxwuHvi4gvTHHVn0yrruwnXm2iM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
imagemagick # for icon resizing
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-onfz+J77jNIgdc7ALiyoXt1CdTyX/C7+bKwtpJm+H+I=";
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
npmBuildScript = "bundle";
|
||||
|
||||
postBuild = ''
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
-c.electronDist=${electron}/libexec/electron \
|
||||
-c.electronVersion=${electron.version}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/blockbench
|
||||
cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench
|
||||
|
||||
for size in 16 32 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
|
||||
done
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/blockbench \
|
||||
--add-flags $out/share/blockbench/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# based on desktop file found in the published AppImage archive
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "blockbench";
|
||||
exec = "blockbench %U";
|
||||
icon = "blockbench";
|
||||
desktopName = "Blockbench";
|
||||
comment = meta.description;
|
||||
categories = [ "3DGraphics" ];
|
||||
startupWMClass = "Blockbench";
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/JannisX11/blockbench/releases/tag/${src.rev}";
|
||||
description = "Low-poly 3D modeling and animation software";
|
||||
homepage = "https://blockbench.net/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "blockbench";
|
||||
maintainers = with lib.maintainers; [ ckie tomasajt ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.173.0";
|
||||
version = "0.174.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-PVBt+AoYd8fMYHzBpgQ261TGlkmyooN7UKX9ooXaRYA=";
|
||||
hash = "sha256-I3YBKdb53BLZ3wFBu8WGJ1kTkuLucMoHLNchMOTNc2o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5bHZt+Oze7JiaY0dKjoMNDdU6wzMphgZ3W3NveRKGy0=";
|
||||
vendorHash = "sha256-wdH4+s9SU2WgIy7bJ4YrT53URvHC4vw7RZpllT2DfV8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
43
pkgs/by-name/mk/mkalias/package.nix
Normal file
43
pkgs/by-name/mk/mkalias/package.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mkalias";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vs49688";
|
||||
repo = "mkalias";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-L6bgCJ0fdiWmtlgTzDmTenTMP74UFUEqiDmE1+gg3zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D mkalias $out/bin/mkalias
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Quick'n'dirty tool to make APFS aliases";
|
||||
homepage = "https://github.com/vs49688/mkalias";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "mkalias";
|
||||
maintainers = with lib.maintainers; [ zane emilytrau ];
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.348";
|
||||
version = "0.0.350";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SEqiW3AdhvsIU9WEEcaRi8paMNgRvnZTFL874mSjUQE=";
|
||||
hash = "sha256-qMtmB/KMMkMfU2AyE2pcjiy3wUwyQUpcP6rMkZk3SMI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE=";
|
||||
|
|
|
|||
48
pkgs/by-name/x5/x509-limbo/package.nix
Normal file
48
pkgs/by-name/x5/x509-limbo/package.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, x509-limbo
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage {
|
||||
pname = "x509-limbo";
|
||||
version = "unstable-2024-03-13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "C2SP";
|
||||
repo = "x509-limbo";
|
||||
rev = "a04fb05cf132e1405f71c12616cf0aead829909a";
|
||||
hash = "sha256-TA4ciHkXg/RKzcIs2bwpx7CxsQDyQMG636Rr74xPsBA=";
|
||||
};
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
flit-core
|
||||
|
||||
requests
|
||||
pydantic
|
||||
jinja2
|
||||
cryptography
|
||||
pyopenssl
|
||||
pyyaml
|
||||
certvalidator
|
||||
certifi
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp limbo.json $out/share/
|
||||
|
||||
wrapProgram $out/bin/limbo \
|
||||
--append-flags "--limbo $out/share/limbo.json"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://x509-limbo.com/";
|
||||
description = "A suite of testvectors for X.509 certificate path validation and tools for building them ";
|
||||
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ baloo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xiu";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "harlanc";
|
||||
repo = "xiu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tXZCWbqwt3v20rvfre/gAUzs8i78FpbNd5qAGNOX5VE=";
|
||||
hash = "sha256-JST8nxsT+w524VzNeIW38Oct/n7VJ/nvrmgks2Vff30=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6nWnw31A27VWJe8JGM+S05sqcZwQRrb1aanamv6ITZ4=";
|
||||
cargoHash = "sha256-te60gZdDmbgOF6rLDAnvDx6vUbmCz3pC/wbu/iXgxAw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.616";
|
||||
version = "0.617";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-MmyVBriesSXxMw1KLvRbNhTUKZFCCV3BawAKmGMnhfs=";
|
||||
hash = "sha256-5lWEihumXSyBsEOOb/oIz7NTgbdcI9C58m9h/d0MPRk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
{ autoPatchelfHook
|
||||
, blas
|
||||
, cmake
|
||||
, cudaPackages_11 ? null
|
||||
, cudaPackages
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, fetchurl
|
||||
, gfortran
|
||||
, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities
|
||||
, gpuTargets ? [ ] # Non-CUDA targets, that is HIP
|
||||
, rocmPackages
|
||||
, lapack
|
||||
|
|
@ -32,9 +32,18 @@
|
|||
|
||||
let
|
||||
inherit (lib) lists strings trivial;
|
||||
inherit (cudaPackages) cudaAtLeast cudaFlags cudaOlder;
|
||||
inherit (magmaRelease) version hash supportedGpuTargets;
|
||||
|
||||
# Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1.
|
||||
# If we're building a version prior to that, use the latest release of the 11.x series.
|
||||
effectiveCudaPackages =
|
||||
if strings.versionOlder version "2.7.1"
|
||||
then cudaPackages_11
|
||||
else cudaPackages;
|
||||
|
||||
inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder;
|
||||
inherit (cudaFlags) cudaCapabilities;
|
||||
|
||||
# NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
|
||||
# of the first list *from* the second list. That means:
|
||||
# lists.subtractLists a b = b - a
|
||||
|
|
@ -115,7 +124,7 @@ stdenv.mkDerivation {
|
|||
ninja
|
||||
gfortran
|
||||
] ++ lists.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
effectiveCudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -123,7 +132,7 @@ stdenv.mkDerivation {
|
|||
lapack
|
||||
blas
|
||||
python3
|
||||
] ++ lists.optionals cudaSupport (with cudaPackages; [
|
||||
] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [
|
||||
cuda_cudart.dev # cuda_runtime.h
|
||||
cuda_cudart.lib # cudart
|
||||
cuda_cudart.static # cudart_static
|
||||
|
|
@ -173,6 +182,7 @@ stdenv.mkDerivation {
|
|||
# TODO(@connorbaker): This should be handled by having CMakeLists.txt install them, but such a patch is
|
||||
# out of the scope of the PR which introduces the `test` output: https://github.com/NixOS/nixpkgs/pull/283777.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/283777#discussion_r1482125034 for more information.
|
||||
# Such work is tracked by https://github.com/NixOS/nixpkgs/issues/296286.
|
||||
''
|
||||
install -Dm755 ../testing/run_{tests,summarize}.py -t "$test/bin/"
|
||||
''
|
||||
|
|
@ -182,7 +192,7 @@ stdenv.mkDerivation {
|
|||
# because it has no files to install.
|
||||
+ ''
|
||||
install -Dm755 ./testing/testing_* ./sparse/testing/testing_* -t "$test/bin/"
|
||||
install -Dm755 ./lib/libtester.so ./lib/liblapacktest.so -t "$test/lib/"
|
||||
install -Dm755 ./lib/lib*test*.* -t "$test/lib/"
|
||||
''
|
||||
# All of the test executables and libraries will have a reference to the build directory in their RPATH, which we
|
||||
# must remove. We do this by shrinking the RPATH to only include the Nix store. The autoPatchelfHook will take care
|
||||
|
|
@ -196,7 +206,8 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
inherit cudaPackages cudaSupport rocmSupport gpuTargets;
|
||||
inherit cudaSupport rocmSupport gpuTargets;
|
||||
cudaPackages = effectiveCudaPackages;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -210,6 +221,7 @@ stdenv.mkDerivation {
|
|||
broken =
|
||||
!(cudaSupport || rocmSupport) # At least one back-end enabled
|
||||
|| (cudaSupport && rocmSupport) # Mutually exclusive
|
||||
|| (cudaSupport && cudaOlder "9.0");
|
||||
|| (cudaSupport && cudaOlder "9.0")
|
||||
|| (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
incdir = "/avr/include";
|
||||
libdir = "/avr/lib";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPecl rec {
|
||||
pname = "mongodb";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-php-driver";
|
||||
rev = version;
|
||||
hash = "sha256-7JzFls5cMzlA2aEM7M4+Dg4yIJNzz/vNOXNEITejePk=";
|
||||
hash = "sha256-5luaCrrnL7l9zhbxYUMSlID7Sx0MQhgFKgl8F6GkGsE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.31.6";
|
||||
version = "1.31.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
|||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OwIOggEfhvGKVTNiVWAt2osGk3R80U0wmcU6KAshpGw=";
|
||||
hash = "sha256-/K8LhKr7TpOPk1CMqNoFJCF+C0N6A8pDkBmS6JZ0sb0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ buildPythonPackage rec {
|
|||
full = with optional-dependencies; (
|
||||
vllm
|
||||
# use absolute path to disambiguate with derivbation argument
|
||||
++ passthru.optional-dependencies.bentoml
|
||||
++ optional-dependencies.bentoml
|
||||
++ fine-tune );
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.112.2";
|
||||
version = "0.112.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VUqAcHv9bQTl2QSgVyCHZkq2jKUAmPYgy4iEDeV7W1A=";
|
||||
sha256 = "sha256-jQ+ke42H55n/ssWFVCWouojSOd/hvkDcmlGUb/a9thQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tHEbHExdbWeZm3+rwRYpRILyPYEYdeVJ91Qr/yNIKV8=";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, kernel
|
||||
, fetchurl
|
||||
, pkg-config, meson, ninja, makeWrapper
|
||||
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core
|
||||
, libbsd, numactl, libbpf, zlib, elfutils, jansson, openssl, libpcap, rdma-core
|
||||
, doxygen, python3, pciutils
|
||||
, withExamples ? []
|
||||
, shared ? false
|
||||
|
|
@ -38,7 +38,7 @@ in stdenv.mkDerivation {
|
|||
buildInputs = [
|
||||
jansson
|
||||
libbpf
|
||||
libelf
|
||||
elfutils
|
||||
libpcap
|
||||
numactl
|
||||
openssl.dev
|
||||
|
|
|
|||
|
|
@ -2,52 +2,52 @@
|
|||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.307-hardened1.patch",
|
||||
"sha256": "01i15w3qzwag2v4r5r5bqyk337pidhmcfif228f286cnjnqz5d7h",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.307-hardened1/linux-hardened-4.19.307-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.309-hardened1.patch",
|
||||
"sha256": "1hww72w5anmfr9czqbl31glzl70s34492k9qz9zax141zg1sf6sp",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.309-hardened1/linux-hardened-4.19.309-hardened1.patch"
|
||||
},
|
||||
"sha256": "0lp3fc7sqy48vpcl2g0n1bz7i1hp9k0nlz3i1xfh9l056ihzzvl3",
|
||||
"version": "4.19.307"
|
||||
"sha256": "1yc45kfiwdqsqa11sxafs82b0day6qvgjcll8rx9vipidsmagbcm",
|
||||
"version": "4.19.309"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.210-hardened1.patch",
|
||||
"sha256": "1fdkkl303kvw9sg9lpzg83157xrl9jcl4jjli1gi2a4j0yz2479n",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.210-hardened1/linux-hardened-5.10.210-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.212-hardened1.patch",
|
||||
"sha256": "0h04i94vshhcli5m4qpnqg4vsi5v1ifvdhhklk7c0bvkfk35cbml",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.212-hardened1/linux-hardened-5.10.212-hardened1.patch"
|
||||
},
|
||||
"sha256": "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf",
|
||||
"version": "5.10.210"
|
||||
"sha256": "14vll2bghd52wngjxy78hgglydcxka59yziji0w56dcdpmky9wqc",
|
||||
"version": "5.10.212"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.149-hardened1.patch",
|
||||
"sha256": "1y56l5l50h673a4n2pb3i3wh494lpnlw9vvdfr6m0jr0vymldb57",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.149-hardened1/linux-hardened-5.15.149-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.151-hardened1.patch",
|
||||
"sha256": "040jc5n9qsdz2wv5ksfvc28vd72nmya2i2f0ps0jiras6l2wlhjz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.151-hardened1/linux-hardened-5.15.151-hardened1.patch"
|
||||
},
|
||||
"sha256": "1c01fnaghj55mkgsgddznq1zq4mswsa05rz00kmh1d3y6sd8115x",
|
||||
"version": "5.15.149"
|
||||
"sha256": "0jby224ncdardjwmf8c59s5j71inpvdlzah984ilf2b6y85pc7la",
|
||||
"version": "5.15.151"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.269-hardened1.patch",
|
||||
"sha256": "06vf0mlp822i4bkpsxbyk1xjlbzabqpncy8qw9zajpjajwv87d7x",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.269-hardened1/linux-hardened-5.4.269-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.271-hardened1.patch",
|
||||
"sha256": "0rw5il7885d0d3k2hmh46541svib6rp32g00fcl5bw37ydmq3z8b",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.271-hardened1/linux-hardened-5.4.271-hardened1.patch"
|
||||
},
|
||||
"sha256": "1kqqm4hpif3jy2ycnb0dfjgzyn18vqhm1i5q7d7rkisks33bwm7z",
|
||||
"version": "5.4.269"
|
||||
"sha256": "0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d",
|
||||
"version": "5.4.271"
|
||||
},
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.79-hardened1.patch",
|
||||
"sha256": "0inip6pmlwrj75vwjimkjgvh4jn6ldrq5312r02xh1i95qb0sg3a",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.79-hardened1/linux-hardened-6.1.79-hardened1.patch"
|
||||
"name": "linux-hardened-6.1.81-hardened1.patch",
|
||||
"sha256": "0af9dxdsa858zyqc0vsrzg098afhg5vpb2wpr6gj2ykwc13iaf07",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.81-hardened1/linux-hardened-6.1.81-hardened1.patch"
|
||||
},
|
||||
"sha256": "16xkd0hcslqlcf55d4ivzhf1fkhfs5yy0m9arbax8pmm5yi9r97s",
|
||||
"version": "6.1.79"
|
||||
"sha256": "0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f",
|
||||
"version": "6.1.81"
|
||||
},
|
||||
"6.5": {
|
||||
"patch": {
|
||||
|
|
@ -62,12 +62,12 @@
|
|||
"6.6": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.6.18-hardened1.patch",
|
||||
"sha256": "0svlck53b7bd38b9b0hzgppmhm59d35r2vqv30ga85ghkvc61byn",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.18-hardened1/linux-hardened-6.6.18-hardened1.patch"
|
||||
"name": "linux-hardened-6.6.21-hardened1.patch",
|
||||
"sha256": "0k35s5pj92lvfp6kw3isg78zc3gijsg0xbzcyvxdkmhzaq8j6i1i",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.21-hardened1/linux-hardened-6.6.21-hardened1.patch"
|
||||
},
|
||||
"sha256": "07cv97l5jiakmmv35n0ganvqfr0590b02f3qb617qkx1zg2xhhsf",
|
||||
"version": "6.6.18"
|
||||
"sha256": "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf",
|
||||
"version": "6.6.21"
|
||||
},
|
||||
"6.7": {
|
||||
"patch": {
|
||||
|
|
|
|||
|
|
@ -4,35 +4,35 @@
|
|||
"hash": "sha256:0q9isgv6lxzrmb4idl0spxv2l7fsk3nn4cdq0vdw9c8lyzrh5yy0"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.81",
|
||||
"hash": "sha256:0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f"
|
||||
"version": "6.1.82",
|
||||
"hash": "sha256:01pcrcjp5mifjjmfz7j1jb8nhq8nkxspavxmv1l7d1qnskcx4l6i"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.151",
|
||||
"hash": "sha256:0jby224ncdardjwmf8c59s5j71inpvdlzah984ilf2b6y85pc7la"
|
||||
"version": "5.15.152",
|
||||
"hash": "sha256:0zm4wkryj4mim4fr7pf5g9rlzh31yb1c40lkp85lvcm5yhjm507h"
|
||||
},
|
||||
"5.10": {
|
||||
"version": "5.10.212",
|
||||
"hash": "sha256:14vll2bghd52wngjxy78hgglydcxka59yziji0w56dcdpmky9wqc"
|
||||
"version": "5.10.213",
|
||||
"hash": "sha256:105df7w6m5a3fngi6ajqs5qblaq4lbxsgcppllrk7v1r68i31kw4"
|
||||
},
|
||||
"5.4": {
|
||||
"version": "5.4.271",
|
||||
"hash": "sha256:0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d"
|
||||
"version": "5.4.272",
|
||||
"hash": "sha256:0rp3waqrm489crcrms2ls7fxcw5jdkjhazvx82z68gj0kaaxb69m"
|
||||
},
|
||||
"4.19": {
|
||||
"version": "4.19.309",
|
||||
"hash": "sha256:1yc45kfiwdqsqa11sxafs82b0day6qvgjcll8rx9vipidsmagbcm"
|
||||
"version": "4.19.310",
|
||||
"hash": "sha256:0sfy2g9jzxd8ia0idll72l7npi2kssdkz29h8jjxhilgmg299v4m"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.21",
|
||||
"hash": "sha256:0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf"
|
||||
"version": "6.6.22",
|
||||
"hash": "sha256:1x52c6ywmspp3naishzsknhy7i0b7mv9baxx25a0y987cjsygqr3"
|
||||
},
|
||||
"6.7": {
|
||||
"version": "6.7.9",
|
||||
"hash": "sha256:0inkvyrvq60j9lxgivkivq3qh94lsfc1dpv6vwgxmy3q0zy37mqg"
|
||||
"version": "6.7.10",
|
||||
"hash": "sha256:00vw90mypcliq0d72jdh1ql2dfmm7gpswln2qycxdz7rfsrrzfd9"
|
||||
},
|
||||
"6.8": {
|
||||
"version": "6.8",
|
||||
"hash": "sha256:1wv5x7qhcd05m8m0myyqm2il6mha1sx11h7ppf8yjsxvx2jdwsf9"
|
||||
"version": "6.8.1",
|
||||
"hash": "sha256:0s7zgk9m545v8y7qjhv7cprrh58j46gpmb8iynyhy2hlwcv8j34d"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "19500";
|
||||
sha256 = "1xlicxwb1j5m4yjyw9ybyffmilzg7xh847jxfl4jy318vjpkmffr";
|
||||
rev = "19509";
|
||||
sha256 = "0dkjvpb075jdasvic8sfpy0dj48fsxgj2yl0zrply7gkaahgns8q";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.210-rt102"; # updated by ./update-rt.sh
|
||||
version = "5.10.211-rt103"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -17,14 +17,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf";
|
||||
sha256 = "1cir36s369fl6s46x16xnjg0wdlnkipsp2zhz11m9d3z205hly1s";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1q4365ix990iw33a63cpn61qvgf8rkzf658xyi0hnr6292hlvajj";
|
||||
sha256 = "07br63p90gwmijxq8ad7iyi4d3fkm6jwwl2s2k1549bbaldchbk6";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.4.264-rt88"; # updated by ./update-rt.sh
|
||||
version = "5.4.271-rt89"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -14,14 +14,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1c5n47dq9khb15hz24a000k3hj913vv1dda6famnm8wpjbfr176k";
|
||||
sha256 = "0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1yzdiip1fm9szx2hhvq9ph7jq00qglb1skis6gv0184g0ls2qddg";
|
||||
sha256 = "15k9jja5yd9zf5yhd7hhydwh4hksg2mybk66jhdjsryh4w9jav7z";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "6.6.20-rt25"; # updated by ./update-rt.sh
|
||||
version = "6.6.21-rt26"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "08nxv2240d2ak6p2vsbjasnp7askamswby3h6cclhhihkgrwgxp2";
|
||||
sha256 = "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1sfalbcfzzjmskxpix1850cypg4zixwzbd9rmpg37n8lclivn2gv";
|
||||
sha256 = "1sh2jkm3h52a5dkc72xgrw1kz1faw1kzhpbqg64gsxbivmxfvf21";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,9 @@
|
|||
, numactl
|
||||
, openssl
|
||||
, zlib
|
||||
, zstd
|
||||
, libbsd
|
||||
, libelf
|
||||
, elfutils
|
||||
, jansson
|
||||
, libnl
|
||||
}:
|
||||
|
|
@ -37,8 +38,9 @@ stdenv.mkDerivation rec {
|
|||
numactl
|
||||
openssl
|
||||
zlib
|
||||
zstd
|
||||
libbsd
|
||||
libelf
|
||||
elfutils
|
||||
jansson
|
||||
libbpf
|
||||
libnl
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, autoreconfHook, pkg-config
|
||||
, glibcLocales, kmod, coreutils, perl
|
||||
, dmidecode, hwdata, sqlite, libtraceevent
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
|
|
@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-BX3kc629FOh5cnD6Sa/69wKdhmhT3Rpz5ZvhnD4MclQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # fix #295002 (segfault on AMD), will be in the release after 0.8.0
|
||||
name = "fix crash on AMD";
|
||||
url = "https://github.com/mchehab/rasdaemon/commit/f1ea76375281001cdf4a048c1a4a24d86c6fbe48.patch";
|
||||
hash = "sha256-1VPDTrAsvZGiGbh52EUdG6tYV/n6wUS0mphOSXzran0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildFishPlugin rec {
|
||||
pname = "forgit";
|
||||
version = "24.03.1";
|
||||
version = "24.03.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
hash = "sha256-DIaoD6o+oY+/FnwQadQh0XqMVP4xbE8gAPtWrvwsG+c=";
|
||||
hash = "sha256-DnGQHWx3uFHFEI1kMTB6hfmaE4tY4O/hesPKj5s4uwQ=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.8.8";
|
||||
version = "2.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-IvAUlCDtrtBiaKZbhAiXqQXbpKiqIaKwMVC3NxaAqtw=";
|
||||
hash = "sha256-UvAIIkH9PNlvLzlh0jm1kG+4OfWsWtt2LSFbFPm7Yv4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -111,6 +111,7 @@ mapAliases ({
|
|||
lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"
|
||||
(blender.withPackages (_: args.packages)).overrideAttrs
|
||||
(lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
|
||||
blockbench-electron = blockbench; # Added 2024-03-16
|
||||
bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10
|
||||
bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01
|
||||
boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08
|
||||
|
|
|
|||
|
|
@ -3555,8 +3555,6 @@ with pkgs;
|
|||
|
||||
blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { };
|
||||
|
||||
blockbench-electron = callPackage ../applications/graphics/blockbench-electron { };
|
||||
|
||||
blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
|
||||
|
||||
bmap-tools = callPackage ../tools/misc/bmap-tools { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue