Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
2f73b699a3
|
|
@ -457,7 +457,7 @@ in {
|
|||
kerberos = handleTest ./kerberos/default.nix {};
|
||||
kernel-generic = handleTest ./kernel-generic.nix {};
|
||||
kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};
|
||||
kernel-rust = handleTestOn ["x86_64-linux"] ./kernel-rust.nix {};
|
||||
kernel-rust = handleTest ./kernel-rust.nix {};
|
||||
keter = handleTest ./keter.nix {};
|
||||
kexec = handleTest ./kexec.nix {};
|
||||
keycloak = discoverTests (import ./keycloak.nix);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) const filterAttrs mapAttrs;
|
||||
inherit (pkgs.lib) const filterAttrs mapAttrs meta;
|
||||
|
||||
kernelRustTest = kernelPackages: import ./make-test-python.nix ({ lib, ... }: {
|
||||
name = "kernel-rust";
|
||||
|
|
@ -38,6 +38,8 @@ let
|
|||
inherit (builtins.tryEval (
|
||||
x.rust-out-of-tree-module or null != null
|
||||
)) success value;
|
||||
in success && value))
|
||||
available =
|
||||
meta.availableOn pkgs.stdenv.hostPlatform x.rust-out-of-tree-module;
|
||||
in success && value && available))
|
||||
pkgs.linuxKernel.vanillaPackages;
|
||||
in mapAttrs (const kernelRustTest) kernels
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hello-wayland";
|
||||
version = "unstable-2023-10-26";
|
||||
version = "0-unstable-2024-03-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = "hello-wayland";
|
||||
rev = "b631afa4f6fd86560ccbdb8c7b6fe42851c06a57";
|
||||
sha256 = "MaBzGZ05uCoeeiglFYHC40hQlPvtDw5sQhqXgtVDySc=";
|
||||
rev = "5f3a35def81116f0a74fcaf5a421d66c6700482d";
|
||||
hash = "sha256-gcLR8gosQlPPgFrxqmRQ6/59RjAfJNX6CcsYP+L+A58=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
|
|
|||
|
|
@ -1,35 +1,31 @@
|
|||
{ stdenv, lib, fetchFromGitea, qmake, qttools, qtbase, qtserialport
|
||||
, qtconnectivity, qtcharts, wrapQtAppsHook }:
|
||||
, qtconnectivity, qtcharts, wrapQtAppsHook, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ubpm";
|
||||
version = "1.7.3";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "LazyT";
|
||||
repo = "ubpm";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-6lvDSU0ssfs71xrac6R6qlmE0QyVcAMTUf0xmJPVzhY=";
|
||||
hash = "sha256-BUUn1WyLT7nm4I+2SpO1ZtIf8isGDy8Za15SiO7sXL8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace sources/mainapp/mainapp.pro \
|
||||
--replace 'INSTALLDIR = /tmp/ubpm.AppDir' "INSTALLDIR = $out" \
|
||||
--replace '/usr/bin' '/bin' \
|
||||
--replace 'INSTALLS += target translations themes devices help lin' 'INSTALLS += target translations themes devices help'
|
||||
'';
|
||||
patches = [
|
||||
# fixes qmake for nix
|
||||
(fetchpatch {
|
||||
url =
|
||||
"https://codeberg.org/LazyT/ubpm/commit/f18841d6473cab9aa2a9d4c02392b8e103245ef6.diff";
|
||||
hash = "sha256-lgXWu8PUUCt66btj6hVgOFXz3U1BJM3ataSo1MpHkfU=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cd ./sources/
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 ../package/lin/ubpm.desktop -t $out/share/applications/
|
||||
install -Dm644 ../package/lin/de.lazyt.ubpm.appdata.xml -t $out/share/metainfo/
|
||||
install -Dm644 ../sources/mainapp/res/ico/app.png $out/share/icons/hicolor/256x256/apps/ubpm.png
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapQtApp $out/bin/ubpm
|
||||
'';
|
||||
|
|
@ -47,5 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "ubpm";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ kurnevsky ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtl-sdr";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librtlsdr";
|
||||
repo = "librtlsdr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk=";
|
||||
hash = "sha256-I1rbywQ0ZBw26wZdtMBkfpj7+kv09XKrrcoDuhIkRmw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "st";
|
||||
version = "0.9";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=";
|
||||
hash = "sha256-FvQ7lDOt6dcNYIXDH5/Znyg16q3jEiECDyIUMDXfwNI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
|
@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://st.suckless.org/";
|
||||
description = "Simple Terminal for X from Suckless.org Community";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andsild ];
|
||||
maintainers = with maintainers; [ andsild qusic ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "st";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, asciinema
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "asciinema-automation";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PierreMarchand20";
|
||||
repo = "asciinema_automation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SjUsPrhoNz2NTPAkmUH0Csv6hbDc6nyKdckGqV5S3GY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
asciinema
|
||||
pexpect
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
dev = [
|
||||
mypy
|
||||
pytest
|
||||
ruff
|
||||
types-pexpect
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "asciinema_automation" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/PierreMarchand20/asciinema_automation/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "CLI utility to automate asciinema recordings";
|
||||
homepage = "https://github.com/PierreMarchand20/asciinema_automation";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "asciinema-automation";
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,24 +1,25 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, libuv
|
||||
, raft-cowsql
|
||||
, sqlite
|
||||
, incus
|
||||
, gitUpdater
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
libuv,
|
||||
raft-cowsql,
|
||||
sqlite,
|
||||
incus,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cowsql";
|
||||
version = "1.15.4";
|
||||
version = "1.15.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cowsql";
|
||||
repo = "cowsql";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-JbLiwWXOrEhqCdM8tWwxl68O5Sga4T7NYCXzqP9+Dh0=";
|
||||
hash = "sha256-cr6AT/n2/6DuGK53JvGLwCkMi4+fS128qxj3X9SJYuw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,14 +37,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [
|
||||
"dev"
|
||||
"out"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit (incus) tests;
|
||||
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "d01b3c4c32357567f3531d4e6ceffc5d23e87583";
|
||||
hash = "sha256-7eaQV+XTCXdrJlo7y21q5j/8ecVwuTMJScRTATcF6oM=";
|
||||
rev = "b06c16ef9f81d84da520232c125d4d8a1d273736";
|
||||
hash = "sha256-t1AIx/Ir5RhasjblH4BSpGOXVvO84SJPSqa7rXWj6b4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postPatch = prev.postPatch + ''
|
||||
|
|
@ -203,8 +203,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "whisper.cpp";
|
||||
rev = "a56f435fd475afd7edf02bfbf9f8c77f527198c2";
|
||||
hash = "sha256-g8ZhVB5sxpfrFzg/0seSrv0vFG0YOP56253n6/KWHfE=";
|
||||
rev = "1558ec5a16cb2b2a0bf54815df1d41f83dc3815b";
|
||||
hash = "sha256-UAqWU3kvkHM+fV+T6gFVsAKuOG6N4FoFgTKGUptwjmE=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = typedBuiltInputs;
|
||||
|
|
@ -315,18 +315,18 @@ let
|
|||
stdenv;
|
||||
|
||||
pname = "local-ai";
|
||||
version = "2.10.1";
|
||||
version = "2.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-skynet";
|
||||
repo = "LocalAI";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-135s1Gw8mfOIx4kXlw2pYrD3ewwajUtnz3sPY/CtoLw=";
|
||||
hash = "sha256-Sqo4NOggUNb1ZemT9TRknBmz8dThe/X43R+4JFfQJ4M=";
|
||||
};
|
||||
|
||||
self = buildGoModule.override { stdenv = effectiveStdenv; } {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-UCeG0TKS+VBW8D87VmxTHS2tCAf0ADEYTJayaSiua6s=";
|
||||
vendorHash = "sha256-3bOr8DnAjTzOpVDB5wmlPxECNteWw3tI0yc1f2Wt4y0=";
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "rabbit";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natarajan-chidambaram";
|
||||
repo = "RABBIT";
|
||||
rev = version;
|
||||
hash = "sha256-IRG3OcWutkZA4oegeEIDyaIadl3dLaMneqOt/H2/Il4=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-E4eUnkKn73MqBFHACdRVFjyUbee+ZJvhP+UYnvHTGdc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,159 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, pkg-config
|
||||
, python3
|
||||
, ruby
|
||||
, rake
|
||||
, git
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, libGL
|
||||
, libGLU
|
||||
, alsa-lib
|
||||
, libX11
|
||||
, xorgproto
|
||||
, libICE
|
||||
, libXi
|
||||
, libXScrnSaver
|
||||
, libXcursor
|
||||
, libXinerama
|
||||
, libXext
|
||||
, libXxf86vm
|
||||
, libXrandr
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, dbus
|
||||
, udev
|
||||
, libdecor
|
||||
, pipewire
|
||||
, libpulseaudio
|
||||
, libiconv
|
||||
# Whether to build TIC-80's "Pro" version, which is an incentive to support the project financially,
|
||||
# that enables some additional features. It is, however, fully open source.
|
||||
, withPro ? false
|
||||
}:
|
||||
let
|
||||
major = "1";
|
||||
minor = "1";
|
||||
revision = "2837";
|
||||
year = "2023";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tic-80";
|
||||
version = "${major}.${minor}.${revision}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nesbox";
|
||||
repo = "TIC-80";
|
||||
rev = "v" + version;
|
||||
sha256 = "sha256-p7OyuD/4KxAzylQDlXW681TvEZwKYDD4zq2KDRkcv48=";
|
||||
# TIC-80 vendors its dependencies as submodules, so to use its current build system,
|
||||
# we need to fetch them. Managing the dependencies ourselves would require a lot of
|
||||
# changes in the build system, which doesn't seem worth it right now. In future versions,
|
||||
# TIC-80 is switching to more modular CMake files, at which point we can reconsider.
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# TIC-80 tries to determine the revision part of the version using its Git history.
|
||||
# Because using leaveDotGit tends be non-reproducible with submodules, we just
|
||||
# hardcode it.
|
||||
# To avoid the awkward copyright range of "2017-1980", which would be caused by the
|
||||
# sandbox environment, hardcode the year of the release.
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'set(VERSION_REVISION 0)' 'set(VERSION_REVISION ${revision})' \
|
||||
--replace-fail 'string(TIMESTAMP VERSION_YEAR "%Y")' 'set(VERSION_YEAR "${year}")'
|
||||
'';
|
||||
|
||||
# Taken from pkgs/development/compilers/mruby; necessary so it uses `gcc` instead of `ld` for linking.
|
||||
# https://github.com/mruby/mruby/blob/e502fd88b988b0a8d9f31b928eb322eae269c45a/tasks/toolchains/gcc.rake#L30
|
||||
preBuild = ''
|
||||
unset LD
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optionals withPro [ "-DBUILD_PRO=On" ] ++ [ "-DBUILD_SDLGPU=On" ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
curl
|
||||
pkg-config
|
||||
python3
|
||||
rake
|
||||
];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
dbus
|
||||
libdecor
|
||||
libGL
|
||||
libGLU
|
||||
libICE
|
||||
libpulseaudio
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libxkbcommon
|
||||
libXrandr
|
||||
libXScrnSaver
|
||||
libXxf86vm
|
||||
pipewire
|
||||
udev
|
||||
wayland
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
# This package borrows heavily from pkgs/development/libraries/SDL2/default.nix
|
||||
# because TIC-80 vendors SDL2, which means we need to take care and implement
|
||||
# a similar environment in TIC-80's vendored copy of SDL2.
|
||||
#
|
||||
# SDL is weird in that instead of just dynamically linking with
|
||||
# libraries when you `--enable-*` (or when `configure` finds) them
|
||||
# it `dlopen`s them at runtime. In principle, this means it can
|
||||
# ignore any missing optional dependencies like alsa, pulseaudio,
|
||||
# some x11 libs, wayland, etc if they are missing on the system
|
||||
# and/or work with wide array of versions of said libraries. In
|
||||
# nixpkgs, however, we don't need any of that. Moreover, since we
|
||||
# don't have a global ld-cache we have to stuff all the propagated
|
||||
# libraries into rpath by hand or else some applications that use
|
||||
# SDL API that requires said libraries will fail to start.
|
||||
#
|
||||
# You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to
|
||||
# list the symbols used in this way.
|
||||
postFixup =
|
||||
let
|
||||
rpath = lib.makeLibraryPath buildInputs;
|
||||
in
|
||||
''
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/tic80):${rpath}" "$out/bin/tic80"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"A free and open source fantasy computer for making, playing and sharing tiny games";
|
||||
longDescription = ''
|
||||
TIC-80 is a free and open source fantasy computer for making, playing and
|
||||
sharing tiny games.
|
||||
|
||||
There are built-in tools for development: code, sprites, maps, sound
|
||||
editors and the command line, which is enough to create a mini retro
|
||||
game. At the exit you will get a cartridge file, which can be stored and
|
||||
played on the website.
|
||||
|
||||
Also, the game can be packed into a player that works on all popular
|
||||
platforms and distribute as you wish. To make a retro styled game the
|
||||
whole process of creation takes place under some technical limitations:
|
||||
240x136 pixels display, 16 color palette, 256 8x8 color sprites, 4
|
||||
channel sound and etc.
|
||||
'';
|
||||
homepage = "https://github.com/nesbox/TIC-80";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "tic80";
|
||||
maintainers = with maintainers; [ blinry ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -10,16 +10,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typstyle";
|
||||
version = "0.11.5";
|
||||
version = "0.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Enter-tainer";
|
||||
repo = "typstyle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jAsKktTgvmZ4NKr1QpJPYjI2HRSw8CPBfJTETVyiRhg=";
|
||||
hash = "sha256-N3dGoLGq9UxTgupowPDE6t2xK6csAPEIcI8zZ1y3gvs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oLJWgF5byM3sY3Bs/wpSrBqjNg4sHDF3RIsWZBiguGI=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"typst-syntax-0.11.0" = "sha256-BezpRq5O89gLbpRtte539vlJ4G5yJ6VPJ8AaC7rQNc0=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -35,6 +40,11 @@ rustPlatform.buildRustPackage rec {
|
|||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
# Disabling tests requiring network access
|
||||
checkFlags = [
|
||||
"--skip=e2e"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Enter-tainer/typstyle/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Format your typst source code";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zbus_xmlgen";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-GkNxlfwLIBfAAcwQnwJHjcviB8tiNVNDZNDib1FQcvs=";
|
||||
hash = "sha256-71HxHfUTRmm4BpBz1lGbcvOpbwNQ/wCa5EKCSM1YEtQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dKoxLEdLZ8B8kTJj3tHcFJzY/Rv3NvwmZBAmHyNhOg8=";
|
||||
cargoHash = "sha256-ADS68qTYO/aDwg4MS4v8t25i9vNx8Je37O7icR3tID8=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
nativeCheckInputs = [ rustfmt ];
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "astropy";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8"; # according to setup.cfg
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-A82AGlUwXaUjzY14DXY1n1clXc3Fn+C91x/VFU/Hd9k=";
|
||||
hash = "sha256-ial13jVtBgjnTx9JNEL7Osu7eoW3OeB0RguwNAAUs5w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "instructor";
|
||||
version = "0.6.4";
|
||||
version = "0.6.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Af52TGnkqY/t0cPkHoRfhFqa/tuOpQXAI/fFfMTcM4Y=";
|
||||
hash = "sha256-4mHXPes1NdYu53XEN7gq626cKy9ju1M7U6n6akfbuVo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -236,9 +236,9 @@ in rec {
|
|||
# hipTensor - Only supports GFX9
|
||||
|
||||
miopengemm= throw ''
|
||||
'miopen-opencl' has been deprecated.
|
||||
'miopengemm' has been deprecated.
|
||||
It is still available for some time as part of rocmPackages_5.
|
||||
''; # Added 2024-3-3;
|
||||
''; # Added 2024-3-3
|
||||
|
||||
composable_kernel = callPackage ./composable_kernel {
|
||||
inherit rocmUpdateScript rocm-cmake clr;
|
||||
|
|
@ -264,7 +264,7 @@ in rec {
|
|||
miopen-opencl= throw ''
|
||||
'miopen-opencl' has been deprecated.
|
||||
It is still available for some time as part of rocmPackages_5.
|
||||
''; # Added 2024-3-3;
|
||||
''; # Added 2024-3-3
|
||||
|
||||
migraphx = callPackage ./migraphx {
|
||||
inherit rocmUpdateScript rocm-cmake rocblas composable_kernel miopen clr half rocm-device-libs;
|
||||
|
|
@ -322,12 +322,11 @@ in rec {
|
|||
useCPU = false;
|
||||
};
|
||||
|
||||
mivisionx-opencl = mivisionx.override {
|
||||
rpp = rpp-opencl;
|
||||
miopen = miopen-opencl;
|
||||
useOpenCL = true;
|
||||
useCPU = false;
|
||||
};
|
||||
mivisionx-opencl = throw ''
|
||||
'mivisionx-opencl' has been deprecated.
|
||||
Other versions of mivisionx are still available.
|
||||
It is also still available for some time as part of rocmPackages_5.
|
||||
''; # Added 2024-3-24
|
||||
|
||||
mivisionx-cpu = mivisionx.override {
|
||||
rpp = rpp-cpu;
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-QHOOWezvBvlVJDFU59HG6vETcAN8vu5KMsMTg4fi2l0=";
|
||||
aarch64-linux = "sha256-EXjD6LRLnrQ/QOeG7iVmTJPYP20FsGLA2cr0ENZNVYc=";
|
||||
armv7l-linux = "sha256-OOAEsUQARJXNFIYhrbhSwh1dNQ5mMIyP+eL9kKFXJvU=";
|
||||
x86_64-darwin = "sha256-WU0BsDISUZnbEFxmH+I95MBpAGkhuW9/7pjuT7wV+AA=";
|
||||
x86_64-linux = "sha256-poFMyPtuVz3WNzUgk/O46SfFyGKLH/h4JmUpNa8UMLE=";
|
||||
aarch64-darwin = "sha256-Wsys6Iagq/dwOKb+htMWosLL51blPxxq3PX8ioZ1UZw=";
|
||||
aarch64-linux = "sha256-vXvhtfHd/Pg4Pv6X23Y9nC1OFUeju5vBn9SEOaI5G6E=";
|
||||
armv7l-linux = "sha256-ZCqvztsUD+dom6HL/IejSjn9Cy/Rwnn7/QFxtW0XFoU=";
|
||||
x86_64-darwin = "sha256-vVbDvu3R66AwCZgg75k1Mjp2oVsrkdMXtqHA5sdACEo=";
|
||||
x86_64-linux = "sha256-POpm9f2HmGU4cBpVHHNCwpoK4+MTnu1Xxb2RUfZtq5Y=";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tailwindcss";
|
||||
version = "3.4.1";
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cgoban";
|
||||
version = "3.5.23";
|
||||
version = "3.5.144";
|
||||
|
||||
nativeBuildInputs = [ adoptopenjdk-jre-bin makeWrapper ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20210116034119/https://files.gokgs.com/javaBin/cgoban.jar";
|
||||
sha256 = "0srw1hqr9prgr9dagfbh2j6p9ivaj40kdpyhs6zjkg7lhnnrrrcv";
|
||||
url = "https://web.archive.org/web/20240314222506/https://files.gokgs.com/javaBin/cgoban.jar";
|
||||
hash = "sha256-ehN/aQU23ZEtDh/+r3H2PDPBrWhgoMfgEfKq5q08kFY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ kernel.stdenv.mkDerivation {
|
|||
homepage = "https://github.com/Rust-for-Linux/rust-out-of-tree-module";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.blitz ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = [ "x86_64-linux" ]
|
||||
++ lib.optional (kernel.kernelAtLeast "6.9") "aarch64-linux";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +1,36 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles, pkg-config
|
||||
, luajit, ncurses, perl, jsoncpp, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
|
||||
, yaml-cpp, nlohmann_json, re2, zstd, uthash
|
||||
}:
|
||||
, luajit, ncurses, perl, jsoncpp, openssl, curl, jq, gcc, elfutils, tbb
|
||||
, protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash }:
|
||||
|
||||
let
|
||||
# Compare with https://github.com/draios/sysdig/blob/0.35.1/cmake/modules/falcosecurity-libs.cmake
|
||||
libsRev = "0.14.2";
|
||||
libsHash = "sha256-sWrniRB/vQd1BZnsiz+wLHugrF3LhuAr9e9gDMavLoo=";
|
||||
# Compare with https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/falcosecurity-libs.cmake
|
||||
libsRev = "0.15.1";
|
||||
libsHash = "sha256-CsKa5ybRj7Mjb71xNwd8FtDprOMfpJMrm3mvkeqZE3o=";
|
||||
|
||||
# Compare with https://github.com/falcosecurity/libs/blob/0.14.2/cmake/modules/valijson.cmake
|
||||
# Compare with https://github.com/falcosecurity/libs/blob/0.15.1/cmake/modules/valijson.cmake
|
||||
valijson = fetchFromGitHub {
|
||||
owner = "tristanpenman";
|
||||
repo = "valijson";
|
||||
rev = "v0.6";
|
||||
hash = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM=";
|
||||
rev = "v1.0.2";
|
||||
hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo=";
|
||||
};
|
||||
|
||||
# https://github.com/draios/sysdig/blob/0.35.1/cmake/modules/driver.cmake
|
||||
# https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/driver.cmake
|
||||
driver = fetchFromGitHub {
|
||||
owner = "falcosecurity";
|
||||
repo = "libs";
|
||||
rev = "7.0.0+driver";
|
||||
hash = "sha256-kXqvfM7HbGh2wEGaO4KBkFDW+m5gpOShJZKJLu9McKk=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "sysdig";
|
||||
version = "0.35.3";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "draios";
|
||||
repo = "sysdig";
|
||||
rev = version;
|
||||
hash = "sha256-wvCnWzQbkkM8qEG93li22P67WX1bGX9orTk+2vsBHZY=";
|
||||
hash = "sha256-EQnmtxByTsSawQPFmTe2pBMcv5rFaNtST+2KXZSFuoo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
|
||||
|
|
@ -58,12 +56,14 @@ stdenv.mkDerivation rec {
|
|||
hardeningDisable = [ "pic" ];
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${fetchFromGitHub {
|
||||
owner = "falcosecurity";
|
||||
repo = "libs";
|
||||
rev = libsRev;
|
||||
hash = libsHash;
|
||||
}} libs
|
||||
cp -r ${
|
||||
fetchFromGitHub {
|
||||
owner = "falcosecurity";
|
||||
repo = "libs";
|
||||
rev = libsRev;
|
||||
hash = libsHash;
|
||||
}
|
||||
} libs
|
||||
chmod -R +w libs
|
||||
|
||||
substituteInPlace libs/userspace/libscap/libscap.pc.in libs/userspace/libsinsp/libsinsp.pc.in \
|
||||
|
|
@ -72,6 +72,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cp -r ${driver} driver-src
|
||||
chmod -R +w driver-src
|
||||
|
||||
# Hacky but needed until https://github.com/draios/sysdig/issues/2077 is resolved for kernel >= 6.8 as strlcpy got removed and build fails
|
||||
${lib.optionalString
|
||||
(kernel != null && lib.versionAtLeast kernel.version "6.8") ''
|
||||
substituteInPlace libs/driver/ppm_events.c driver-src/driver/ppm_events.c --replace-fail "strlcpy" "strscpy"
|
||||
''}
|
||||
|
||||
cmakeFlagsArray+=(
|
||||
"-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
|
||||
"-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver"
|
||||
|
|
@ -91,10 +98,10 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";
|
||||
|
||||
env.NIX_CFLAGS_COMPILE =
|
||||
# needed since luajit-2.1.0-beta3
|
||||
"-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i)) " +
|
||||
# fix compiler warnings been treated as errors
|
||||
"-Wno-error";
|
||||
# needed since luajit-2.1.0-beta3
|
||||
"-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i)) " +
|
||||
# fix compiler warnings been treated as errors
|
||||
"-Wno-error";
|
||||
|
||||
preConfigure = ''
|
||||
if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then
|
||||
|
|
@ -107,39 +114,37 @@ stdenv.mkDerivation rec {
|
|||
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
# Fix the bash completion location
|
||||
installShellCompletion --bash $out/etc/bash_completion.d/sysdig
|
||||
rm $out/etc/bash_completion.d/sysdig
|
||||
rmdir $out/etc/bash_completion.d
|
||||
rmdir $out/etc
|
||||
''
|
||||
+ lib.optionalString (kernel != null) ''
|
||||
make install_driver
|
||||
kernel_dev=${kernel.dev}
|
||||
kernel_dev=''${kernel_dev#${builtins.storeDir}/}
|
||||
kernel_dev=''${kernel_dev%%-linux*dev*}
|
||||
if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then
|
||||
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko
|
||||
else
|
||||
for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do
|
||||
if test -f "$i"; then
|
||||
xz -d $i
|
||||
sed -i "s#$kernel_dev#................................#g" ''${i%.xz}
|
||||
xz -9 ''${i%.xz}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Fix the bash completion location
|
||||
installShellCompletion --bash $out/etc/bash_completion.d/sysdig
|
||||
rm $out/etc/bash_completion.d/sysdig
|
||||
rmdir $out/etc/bash_completion.d
|
||||
rmdir $out/etc
|
||||
'' + lib.optionalString (kernel != null) ''
|
||||
make install_driver
|
||||
kernel_dev=${kernel.dev}
|
||||
kernel_dev=''${kernel_dev#${builtins.storeDir}/}
|
||||
kernel_dev=''${kernel_dev%%-linux*dev*}
|
||||
if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then
|
||||
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko
|
||||
else
|
||||
for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do
|
||||
if test -f "$i"; then
|
||||
xz -d $i
|
||||
sed -i "s#$kernel_dev#................................#g" ''${i%.xz}
|
||||
xz -9 ''${i%.xz}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
|
||||
description =
|
||||
"A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
|
||||
license = with licenses; [ asl20 gpl2 mit ];
|
||||
maintainers = [maintainers.raskin];
|
||||
platforms = ["x86_64-linux"] ++ platforms.darwin;
|
||||
broken = kernel != null && versionOlder kernel.version "4.14";
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = [ "x86_64-linux" ] ++ platforms.darwin;
|
||||
broken = kernel != null && ((versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen);
|
||||
homepage = "https://sysdig.com/opensource/";
|
||||
downloadPage = "https://github.com/draios/sysdig/releases";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildFishPlugin rec {
|
||||
pname = "forgit";
|
||||
version = "24.03.2";
|
||||
version = "24.04.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
hash = "sha256-DnGQHWx3uFHFEI1kMTB6hfmaE4tY4O/hesPKj5s4uwQ=";
|
||||
hash = "sha256-fvhlN2N3u++rfAeiwRRUX+Cv5expyA6aEUB6/TvV5+4=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -768,7 +768,7 @@ mapAliases ({
|
|||
migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08
|
||||
minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30
|
||||
miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08
|
||||
miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages.miopengemm'"; # Added 2023-10-08
|
||||
miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08
|
||||
miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08
|
||||
miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08
|
||||
mime-types = mailcap; # Added 2022-01-21
|
||||
|
|
|
|||
Loading…
Reference in New Issue