Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -14494,6 +14494,12 @@
|
||||
github = "pbsds";
|
||||
githubId = 140964;
|
||||
};
|
||||
pca006132 = {
|
||||
name = "pca006132";
|
||||
email = "john.lck40@gmail.com";
|
||||
github = "pca006132";
|
||||
githubId = 12198657;
|
||||
};
|
||||
pcarrier = {
|
||||
email = "pc@rrier.ca";
|
||||
github = "pcarrier";
|
||||
|
||||
@@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sonic-pi";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonic-pi-net";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rXMCaI9zvWIXmT7ZqIArsvZmEkEEbs+5jYDYsSGeCXc=";
|
||||
hash = "sha256-s9B3OBwiUdCJyxbeQXeidv38pzmvC442Byl+llabqp0=";
|
||||
};
|
||||
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "mix-deps-${pname}";
|
||||
mixEnv = "test";
|
||||
src = "${src}/app/server/beam/tau";
|
||||
hash = "sha256-YbYe+hljnoWFgV72OQ2YaUcnhucEtVb+TCLcMYzqUWU=";
|
||||
hash = "sha256-7wqFI3f0CRVrXK2IUguqHNANwKMmTak/Xh9nr624TXc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -111,6 +111,11 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# Pull fix ending upstream inclusion for gcc-12+ support:
|
||||
# https://github.com/darbyjohnston/DJV/pull/477
|
||||
(fetchpatch {
|
||||
name = "gcc-13-cstdint-include.patch";
|
||||
url = "https://github.com/darbyjohnston/DJV/commit/be0dd90c256f30c0305ff7b180fd932a311e66e5.patch";
|
||||
hash = "sha256-x8GAfakhgjBiCKHbfgCukT5iFNad+zqURDJkQr092uk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "gcc-11-limits.patch";
|
||||
url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch";
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vengi-tools";
|
||||
version = "0.0.27";
|
||||
version = "0.0.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgerhardy";
|
||||
repo = "vengi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A37IY66wZZK7Tv0zWsORO6CuRRRj7YmKLnEPSbfAvwI=";
|
||||
hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
let
|
||||
pname = "qdirstat";
|
||||
version = "1.8.1";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shundhammer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yWv41iWtdTdlFuvLHKCbwmnSXq7Z5pIJq28GMDltdxM=";
|
||||
sha256 = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tui-journal";
|
||||
version = "0.6.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmmarAbouZor";
|
||||
repo = "tui-journal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0qedRXjuISJst6cZ7rwz/4a935XsBMSzGN8JrzBKjeQ=";
|
||||
hash = "sha256-1cCtWhWOzCezi29oQsa0L1LTIb87ITaJk0teDP2xV78=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-d79NTaW0zs8g62EKqiphWEdgYEnLeRk4NFog0rivr3s=";
|
||||
cargoHash = "sha256-uWxzJONzRDeZVuilpEj4KprF3PtjRhJk8C9zjs5yCvg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Your journal app if you live in a terminl";
|
||||
description = "Your journal app if you live in a terminal";
|
||||
homepage = "https://github.com/AmmarAbouZor/tui-journal";
|
||||
changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netsurf-buildsystem";
|
||||
version = "1.9";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio=";
|
||||
hash = "sha256-PT451WnkRnfEsXkSm95hTGV5jis+YlMWAjnR/W6uTXk=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-s3";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hypnoglow";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D79nUIueOV2FC3I2LreHMzl/xOpzNa+OsfL5wcnyY78=";
|
||||
hash = "sha256-0wx8q93y8goXNh2x/XI3FQEXImVTpONURiDW2dCAi6o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dKKggD/VlBiopt2ygh07+6bTBbRgQfWbiY/1qJSSx/0=";
|
||||
vendorHash = "sha256-i+rWg0/EUes5soFVRu9M5/iktbtudII7Ly5pcnOU2hU=";
|
||||
|
||||
# NOTE: Remove the install and upgrade hooks.
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gnmic";
|
||||
version = "0.33.0";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openconfig";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7jykosmVG+oJ6/27x+VtlVVxq/OQIctcjB1Wjs1DcRU=";
|
||||
hash = "sha256-PGhU8u2dYo9S0yv8/F7YBSHUZWxxFUXIbjQIjsX6AGw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VjeOSnCAdG+RlIg9uIyyQ8wKUqyX5uc2RXG75q84vm4=";
|
||||
vendorHash = "sha256-HoOjVfpowb5jvAYdQ3cbCQmSl1RJKPDjvOaOGfhe5TY=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "super-productivity";
|
||||
version = "7.14.3";
|
||||
version = "7.17.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
|
||||
sha256 = "sha256-wW72T1+RfejaI9LxSxa/g0lvIRmAeFa2ZaEa8K9mRcw=";
|
||||
sha256 = "sha256-CcgjfA0BRfCrRb8N+KIgheUAF+JJK3yIv9Trp+gg+s0=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.6.5";
|
||||
version = "6.6.8";
|
||||
pname = "timeular";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
||||
hash = "sha256-Ok2EnRLKrLxZQfPj5/fGGJS4lW6DBEmSx+f+Z2Y77fM=";
|
||||
hash = "sha256-giQjcUnhBGt2egRmYLEL8cFZYKjtUu34ozh1filNyiw=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
};
|
||||
"kicad-testing" = {
|
||||
kicadVersion = {
|
||||
version = "7.0-2024-01-07";
|
||||
version = "7.0-2024-01-27";
|
||||
src = {
|
||||
rev = "ace6439758f8d211001235f36f02a60488337e41";
|
||||
sha256 = "0z4p2srz9rld7mq6k2y5fipz8mgsdhh2506wam4388nklzzkrccr";
|
||||
rev = "13fcb571f7e5bf4bf142d151651fc577aca32053";
|
||||
sha256 = "0wvk3wx5lm2jvyip6b96ja464hdzp9klb7b7ng5i3mdldabh0jba";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "7.0-2024-01-07";
|
||||
version = "7.0-2024-01-27";
|
||||
libSources = {
|
||||
symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9";
|
||||
symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v";
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{ buildPythonApplication
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, setuptools
|
||||
, setuptools-rust
|
||||
, rustPlatform
|
||||
@@ -9,30 +11,37 @@
|
||||
, breezy
|
||||
, dulwich
|
||||
, jinja2
|
||||
, libiconv
|
||||
, openssl
|
||||
, pyyaml
|
||||
, ruamel-yaml
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "silver-platter";
|
||||
version = "0.5.12";
|
||||
version = "0.5.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmer";
|
||||
repo = "silver-platter";
|
||||
rev = version;
|
||||
hash = "sha256-QkTT9UcJuGDAwpp/CtXobPvfTYQzFakBR72MhF//Bpo=";
|
||||
hash = "sha256-k+C4jrC4FO/yy9Eb6x4lv1zyyp/eGkpMcDqZ0KoxfBs=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-QLnKu9D23FVp1jCSuxN3odPZ1ToAZ6i/FNS8BkmNuQw=";
|
||||
hash = "sha256-+EUj6iBnHF4zlOAAfaHy5V/z6CCD/LFksBClE4FaHHc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools breezy dulwich jinja2 pyyaml ruamel-yaml ];
|
||||
nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ];
|
||||
nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ]
|
||||
++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
pythonImportsCheck = [ "silver_platter" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automate the creation of merge proposals for scriptable changes";
|
||||
|
||||
@@ -38,13 +38,13 @@ let
|
||||
in
|
||||
buildPerlModule rec {
|
||||
pname = "pipe-viewer";
|
||||
version = "0.4.8";
|
||||
version = "0.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trizen";
|
||||
repo = "pipe-viewer";
|
||||
rev = version;
|
||||
hash = "sha256-bFbriqpy+Jjwv/s4PZmLdL3hFtM8gfIn+yJjk3fCsnQ=";
|
||||
hash = "sha256-7l8exCC9robe1hKnQAaIVfnn8L+FuwTOkxaxlwJmpe0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}: stdenv.mkDerivation rec {
|
||||
|
||||
pname = "vdr";
|
||||
version = "2.6.5";
|
||||
version = "2.6.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.tvdr.de/vdr.git";
|
||||
rev = version;
|
||||
hash = "sha256-CKgo1Saj6EkSRNoIh16wzGHmToIMADZtjd8VQ+c1nus=";
|
||||
hash = "sha256-3om/Q67PHtX/aIG4zMCaJTyD9bZNEcyE5LQTeb+zB+M=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -140,6 +140,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://gitlab.com/qemu-project/qemu/-/commit/9d5b42beb6978dc6219d5dc029c9d453c6b8d503.diff";
|
||||
sha256 = "sha256-NknkH/gFTsMcdq8/ArwM4+qrpU+ZHd+xVMFUuMJTtf0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-6693.patch";
|
||||
url = "https://gitlab.com/qemu-project/qemu/-/commit/2220e8189fb94068dbad333228659fbac819abb0.patch";
|
||||
sha256 = "sha256-uoFFFsVZ8XnsI2GD7xsRFNWghWL7/PSYTc1yhXI6nv4=";
|
||||
})
|
||||
]
|
||||
++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evilwm";
|
||||
version = "1.1.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz";
|
||||
sha256 = "79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a";
|
||||
sha256 = "sha256-QhLW2QywBbLMiIFLyFN3NrSVCrWCZLu2W4gHrGO9xLk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
firmware:
|
||||
|
||||
let
|
||||
args = lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };
|
||||
args = {
|
||||
allowedRequisites = [];
|
||||
} // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };
|
||||
in
|
||||
|
||||
runCommand "${firmware.name}-xz" args ''
|
||||
@@ -15,10 +17,13 @@ runCommand "${firmware.name}-xz" args ''
|
||||
sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)
|
||||
(cd ${firmware} && find lib/firmware -type l) | while read link; do
|
||||
target="$(readlink "${firmware}/$link")"
|
||||
if [ -f $target ]; then
|
||||
if [ -f "${firmware}/$link" ]; then
|
||||
ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz"
|
||||
else
|
||||
ln -vs -- "''${target/^${firmware}/$out}" "$out/$link"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Checking for broken symlinks:"
|
||||
find -L $out -type l -print -execdir false -- '{}' '+'
|
||||
''
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bngblaster";
|
||||
version = "0.8.29";
|
||||
version = "0.8.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtbrick";
|
||||
repo = "bngblaster";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-yuWSGN7wLRksNjgr7c5GiC9JTN4T1PJV4Js1ZOGBKqA=";
|
||||
hash = "sha256-oxmDg3en7mgTmhnvpkBtBJ6o/iF+GZ3Td3V6jlWMBZc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eiwd";
|
||||
version = "2.8-1";
|
||||
version = "2.10-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "illiliti";
|
||||
repo = "eiwd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-SD/RJFuGBwFT4G73f93VrWO/6mGKQxjVhmNrpKRA/WY=";
|
||||
hash = "sha256-AB4NBwfELy0yjzxS0rCcF641CGEdyM9tTB+ZWaM+erg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
{ lib
|
||||
, clangStdenv
|
||||
, llvmPackages
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, pkg-config
|
||||
, bison
|
||||
, boost
|
||||
, cairo
|
||||
, cgal_5
|
||||
, clipper2
|
||||
, double-conversion
|
||||
, eigen
|
||||
, flex
|
||||
, fontconfig
|
||||
, freetype
|
||||
, glib
|
||||
, glm
|
||||
, gmp
|
||||
, harfbuzz
|
||||
, hidapi
|
||||
, lib3mf
|
||||
, libGL
|
||||
, libGLU
|
||||
, libICE
|
||||
, libSM
|
||||
, libsForQt5
|
||||
, libspnav
|
||||
, libzip
|
||||
, mpfr
|
||||
, python3
|
||||
, tbb_2021_8
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
}:
|
||||
let
|
||||
# get cccl from source to avoid license issues
|
||||
nvidia-cccl = clangStdenv.mkDerivation {
|
||||
pname = "nvidia-cccl";
|
||||
# note that v2.2.0 has some cmake issues
|
||||
version = "2.2.0-unstable-2024-01-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "cccl";
|
||||
fetchSubmodules = true;
|
||||
rev = "0c9d03276206a5f59368e908e3d643610f9fddcd";
|
||||
hash = "sha256-f11CNfa8jF9VbzvOoX1vT8zGIJL9cZ/VBpiklUn0YdU=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ tbb_2021_8 ];
|
||||
cmakeFlags = [
|
||||
# only enable what we need
|
||||
"-DCCCL_ENABLE_CUB=OFF"
|
||||
"-DCCCL_ENABLE_LIBCUDACXX=ON"
|
||||
"-DCCCL_ENABLE_THRUST=ON"
|
||||
"-DCCCL_ENABLE_TESTING=OFF"
|
||||
"-DCCCL_ENABLE_EXAMPLES=OFF"
|
||||
|
||||
"-DTHRUST_DEVICE_SYSTEM=TBB"
|
||||
"-DTHRUST_HOST_SYSTEM=CPP"
|
||||
"-DTHRUST_ENABLE_HEADER_TESTING=OFF"
|
||||
"-DTHRUST_ENABLE_TESTING=OFF"
|
||||
"-DTHRUST_ENABLE_EXAMPLES=OFF"
|
||||
|
||||
"-DLIBCUDACXX_ENABLE_CUDA=OFF"
|
||||
"-DLIBCUDACXX_ENABLE_STATIC_LIBRARY=OFF"
|
||||
"-DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=OFF"
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "CUDA C++ Core Libraries";
|
||||
homepage = "https://github.com/NVIDIA/cccl";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
in
|
||||
# clang consume much less RAM than GCC
|
||||
clangStdenv.mkDerivation rec {
|
||||
pname = "openscad-unstable";
|
||||
version = "2024-01-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openscad";
|
||||
repo = "openscad";
|
||||
rev = "88d244aed3c40a76194ff537ed84bd65bc0e1aeb";
|
||||
hash = "sha256-qkQNbYhmOxF14zm+eCcwe9asLOEciYBANefUb8+KNEI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
ninja
|
||||
bison
|
||||
flex
|
||||
python3
|
||||
libsForQt5.qt5.wrapQtAppsHook
|
||||
llvmPackages.bintools
|
||||
];
|
||||
buildInputs = with libsForQt5; with qt5; [
|
||||
# manifold dependencies
|
||||
clipper2
|
||||
glm
|
||||
tbb_2021_8
|
||||
nvidia-cccl
|
||||
|
||||
boost
|
||||
cairo
|
||||
cgal_5
|
||||
double-conversion
|
||||
eigen
|
||||
fontconfig
|
||||
freetype
|
||||
glib
|
||||
gmp
|
||||
harfbuzz
|
||||
hidapi
|
||||
lib3mf
|
||||
libspnav
|
||||
libzip
|
||||
mpfr
|
||||
qscintilla
|
||||
qtbase
|
||||
qtmultimedia
|
||||
]
|
||||
++ lib.optionals clangStdenv.isLinux [ libICE libSM libGLU libGL wayland wayland-protocols qtwayland ]
|
||||
++ lib.optional clangStdenv.isDarwin qtmacextras
|
||||
;
|
||||
cmakeFlags = [
|
||||
"-DEXPERIMENTAL=ON" # enable experimental options
|
||||
"-DSNAPSHOT=ON" # nightly icons
|
||||
"-DUSE_BUILTIN_OPENCSG=ON" # bundled latest opencsg
|
||||
"-DOPENSCAD_VERSION=\"${builtins.replaceStrings ["-"] ["."] version}\""
|
||||
"-DCMAKE_UNITY_BUILD=ON" # faster build
|
||||
"-DENABLE_TESTS=OFF" # tests do not work for now
|
||||
# IPO
|
||||
"-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld"
|
||||
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON"
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "3D parametric model compiler (unstable)";
|
||||
longDescription = ''
|
||||
OpenSCAD is a software for creating solid 3D CAD objects. It is free
|
||||
software and available for Linux/UNIX, MS Windows and macOS.
|
||||
|
||||
Unlike most free software for creating 3D models (such as the famous
|
||||
application Blender) it does not focus on the artistic aspects of 3D
|
||||
modelling but instead on the CAD aspects. Thus it might be the
|
||||
application you are looking for when you are planning to create 3D models of
|
||||
machine parts but pretty sure is not what you are looking for when you are more
|
||||
interested in creating computer-animated movies.
|
||||
'';
|
||||
homepage = "https://openscad.org/";
|
||||
# note that the *binary license* is gpl3 due to CGAL
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ pca006132 raskin ];
|
||||
mainProgram = "openscad";
|
||||
};
|
||||
}
|
||||
@@ -5,14 +5,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "oterm";
|
||||
version = "0.1.18";
|
||||
version = "0.1.21";
|
||||
pyproject = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggozad";
|
||||
repo = "oterm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hog0oEiZMxM3lM3xFZ+c15OTOwGXZ97FmG4PpyA94Ys=";
|
||||
hash = "sha256-S6v7VDIGPu6UDbDe0H3LWF6IN0Z6ENmiCDxz+GuCibI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pillow"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
textual
|
||||
typer
|
||||
@@ -23,8 +28,18 @@ python3Packages.buildPythonApplication rec {
|
||||
pyperclip
|
||||
packaging
|
||||
rich-pixels
|
||||
pillow
|
||||
aiohttp
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"oterm"
|
||||
];
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
||||
# Tests require a HTTP connection to ollama
|
||||
doCheck = false;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "show-midi";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gbevin";
|
||||
repo = "ShowMIDI";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-BtkfeHZyeSZH6wIojj3dd2nCS5R535dSWsis/hXJbPc=";
|
||||
hash = "sha256-xt2LpoiaOWAeWM/YzaKM0WGi8aHs4T7pvMw1s/P4Oj0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
, gtk3
|
||||
, glib
|
||||
, libxml2
|
||||
, libarchive
|
||||
, libsecret
|
||||
, poppler
|
||||
, itstool
|
||||
@@ -14,7 +15,7 @@
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, enableEpub ? true
|
||||
, webkitgtk
|
||||
, webkitgtk_4_1
|
||||
, enableDjvu ? true
|
||||
, djvulibre
|
||||
, enablePostScript ? true
|
||||
@@ -27,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atril";
|
||||
version = "1.26.1";
|
||||
version = "1.26.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pTphOsuXAaGK1nG/WQJU0c6Da6CuG+LAvYlI/fa0kaQ=";
|
||||
sha256 = "wwW51fVxP0Jiau4DggkTA0IrPXGlbd1lkyzNsjx86SY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
glib
|
||||
itstool
|
||||
libarchive
|
||||
libsecret
|
||||
libxml2
|
||||
poppler
|
||||
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
texlive.bin.core # for synctex, used by the pdf back-end
|
||||
]
|
||||
++ lib.optionals enableDjvu [ djvulibre ]
|
||||
++ lib.optionals enableEpub [ webkitgtk ]
|
||||
++ lib.optionals enableEpub [ webkitgtk_4_1 ]
|
||||
++ lib.optionals enablePostScript [ libspectre ]
|
||||
++ lib.optionals enableXps [ libgxps ]
|
||||
;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cglm";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "recp";
|
||||
repo = "cglm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qOPOJ+h1bq5yKkP3ZNeZnRwiOMSgS7bxTk7s/5tREQw=";
|
||||
sha256 = "sha256-jaG+XGbSx5SaNhGFWLh+1WTB+ya3c5tBZYs9xKIRafI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "entt";
|
||||
version = "3.12.2";
|
||||
version = "3.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skypjack";
|
||||
repo = "entt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gzoea3IbmpkIZYrfTZA6YgcnDU5EKdXF5Y7Yz2Uaj4A=";
|
||||
hash = "sha256-LiQBKpXSr5+zOgtc+8snGqN/Aq3EHhQjlMBuqDOlSz0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdcm";
|
||||
version = "3.0.22";
|
||||
version = "3.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "malaterre";
|
||||
repo = "GDCM";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-geWNGbBJGKPs5hNO42vtVOj0rOWyM6zmcocvRhWW4s0=";
|
||||
hash = "sha256-zwIPWcjTrfbdNBzAqwV6lU2l6sx+e4Yi7dprdem6AeE=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, buildDunePackage
|
||||
, angstrom
|
||||
, ptime
|
||||
, seq
|
||||
, timedesc-tzdb
|
||||
, timedesc-tzlocal
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "timedesc";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/daypack-dev/timere/releases/download/timedesc-${version}/timedesc-${version}.tar.gz";
|
||||
hash = "sha256-NnnQpWOE1mt/F5lkWRPdDwpqXCUlcNi+Z5GE6YQQLK8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angstrom
|
||||
ptime
|
||||
seq
|
||||
timedesc-tzdb
|
||||
timedesc-tzlocal
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "OCaml date time handling library";
|
||||
homepage = "https://github.com/daypack-dev/timere";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, timedesc
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "timedesc-tzdb";
|
||||
|
||||
inherit (timedesc) version src sourceRoot;
|
||||
|
||||
meta = timedesc.meta // {
|
||||
description = "Virtual library for Timedesc time zone database backends";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, timedesc
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "timedesc-tzlocal";
|
||||
|
||||
inherit (timedesc) version src sourceRoot;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
meta = timedesc.meta // {
|
||||
description = "Virtual library for Timedesc local time zone detection backends";
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "acquire";
|
||||
version = "3.11";
|
||||
version = "3.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "acquire";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0aLPDh9lrKpHo97VFFwCmPXyXXNFGgkdjoppzm3BCTo=";
|
||||
hash = "sha256-anRNCnLDKHAEfOWi6m1n4R9lvFTlZgw5xxh39exvzH0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, openssl
|
||||
, pylsqpack
|
||||
@@ -13,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioquic";
|
||||
version = "0.9.23";
|
||||
version = "0.9.25";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-UsnaYO0IN/6LimoNfc8N++vsjpoCfhDr9yBPBWnFj6g=";
|
||||
hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -29,6 +30,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
cryptography
|
||||
pylsqpack
|
||||
pyopenssl
|
||||
service-identity
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "9.0.1";
|
||||
version = "9.1.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zAbCUfFCg3z1QLeXdyRZapTz0P6dqWGRdeneZTnNBwU=";
|
||||
hash = "sha256-WtlJkfsODlOncKn/zxtoBH9hsigtlIp9JoLs2PuPob8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aocd-example-parser";
|
||||
version = "unstable-2023-12-17";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wimglenn";
|
||||
repo = "aocd-example-parser";
|
||||
rev = "07330183f3e43401444fe17b08d72eb6168504e1";
|
||||
hash = "sha256-iOxqzZj29aY/xyigir1KOU6GcBBvnlxEOBLHChEQjf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
# Circular dependency with aocd
|
||||
# pythonImportsCheck = [
|
||||
# "aocd_example_parser"
|
||||
# ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Default implementation of an example parser plugin for advent-of-code-data";
|
||||
homepage = "https://github.com/wimglenn/aocd-example-parser";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,32 +1,33 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, aocd-example-parser
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, pytestCheckHook
|
||||
, tzlocal
|
||||
, pytest-mock
|
||||
, numpy
|
||||
, pebble
|
||||
, pook
|
||||
, pytest-freezegun
|
||||
, pytest-mock
|
||||
, pytest-raisin
|
||||
, pytest-socket
|
||||
, requests-mock
|
||||
, pook
|
||||
, numpy
|
||||
, rich
|
||||
, pebble
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, termcolor
|
||||
, beautifulsoup4
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-mock
|
||||
, rich
|
||||
, setuptools
|
||||
, termcolor
|
||||
, tzlocal
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aocd";
|
||||
version = "2.0.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wimglenn";
|
||||
@@ -35,15 +36,30 @@ buildPythonPackage rec {
|
||||
hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
requests
|
||||
termcolor
|
||||
aocd-example-parser
|
||||
beautifulsoup4
|
||||
pebble
|
||||
tzlocal
|
||||
setuptools
|
||||
python-dateutil
|
||||
requests
|
||||
rich # for example parser aoce. must either be here or checkInputs
|
||||
termcolor
|
||||
tzlocal
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
numpy
|
||||
pook
|
||||
pytest-freezegun
|
||||
pytest-mock
|
||||
pytest-raisin
|
||||
pytest-socket
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
# Too many failing tests
|
||||
@@ -85,20 +101,6 @@ buildPythonPackage rec {
|
||||
"test_submit_float_warns"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pytest-freezegun
|
||||
pytest-raisin
|
||||
pytest-socket
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pook
|
||||
numpy
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aocd"
|
||||
];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai-grpc";
|
||||
version = "10.0.4";
|
||||
version = "10.0.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python-grpc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jhM+UfyaliVmUH6e3ArZvZokB8lDKS/fx8376cZwlQM=";
|
||||
hash = "sha256-SDGkAlIUCfz4G1TyGjSd4M5Syl8sw/aeUHT6J5V7RKg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-cstruct";
|
||||
version = "3.10";
|
||||
version = "3.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.cstruct";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cdBojvFI0cN6mEZ98xLa3XldvIoR+Jv1c0/hvVkKVoQ=";
|
||||
hash = "sha256-67s0Qr/YeQp/K9MZS+btKdp+9J6mIMCwiittIUB9p2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-esedb";
|
||||
version = "3.10";
|
||||
version = "3.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.esedb";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RlXnUD+KiBmntM/f7jEzdZ0Tdb8vPGvW0e3XoANaPnk=";
|
||||
hash = "sha256-ynrZqP3QXe+SXFB0Uz+tdH2jGj+hpHfarbEN2P1+r/8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-extfs";
|
||||
version = "3.7";
|
||||
version = "3.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.extfs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RsAWqtoarn/2sZU5dkQYt794dXGOr5fe68VgMNDBst4=";
|
||||
hash = "sha256-yM9PTMI4/8oU2bvOCKdh5tT0gw9+6esV1auKSbupL0U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-hypervisor";
|
||||
version = "3.10";
|
||||
version = "3.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.hypervisor";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30=";
|
||||
hash = "sha256-x7C2h9NZRlkJWAe0+PCmOhOpfHM2/4vc7oEGQqGEPq8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-ntfs";
|
||||
version = "3.7";
|
||||
version = "3.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.ntfs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bnFimn5ektIKiX73NZ+1Iz3Uoew138a0nFJgypffC4o=";
|
||||
hash = "sha256-BmXYnN8B7r/gz+zEWWS7ClOv29QOiHrm7g2ZNZXlnGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-target";
|
||||
version = "3.14";
|
||||
version = "3.15";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.target";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vp1upVwohMXFKxlHy5lWmigdq9MUk1UknSsPpCXt50s=";
|
||||
hash = "sha256-1uWKlp0t1mVtt3lbjl4U1TMxE2YHN/GzGs8OuoVTRqc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-util";
|
||||
version = "3.13";
|
||||
version = "3.14";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.util";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GUDYr3lP0BV7zJaaUen78CplRA7jfn1zYes7kczNGEU=";
|
||||
hash = "sha256-NzqQW6OFv+CtAxa5J2X/XGS9UCFfhMp4elvgcTrA1Wg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-volume";
|
||||
version = "3.7";
|
||||
version = "3.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.volume";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5ZO++l6BWA085U5IkghjCT46YhKc85SB7sNU2h4Fpec=";
|
||||
hash = "sha256-hEfURO4ITpjSpfHMlYfzO1cG+tjvqBP5QLYzo2uz8yo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-xfs";
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.xfs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-unrkmhLvjWWKHiqJWCEVEVcUjxWXMznjOytRbDwAxKw=";
|
||||
hash = "sha256-bqpN4Ho5A9j8oLwErPErMVgkanIkdNTqcT3lkdQiw6M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect";
|
||||
version = "3.11";
|
||||
version = "3.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6y+p+Ulc1Viu5s1AL/ecVtO4YRnmem/ZleY8xC4CJrU=";
|
||||
hash = "sha256-hy5Yr/yR7CC7cp6pA1JP+GKazu+N4AwPqFKwb7zM+N8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fontParts";
|
||||
version = "0.11.0";
|
||||
version = "0.12.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg=";
|
||||
hash = "sha256-eeU13S1IcC+bsiK3YDlT4rVDeXDGcxx1wY/is8t5pCA=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fuse-python";
|
||||
version = "1.0.5";
|
||||
version = "1.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o=";
|
||||
hash = "sha256-MhiAY2UkCM1HKuu2+S0135LIu0IAk3H4yJJ7s35r3Rs=";
|
||||
};
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glean-parser";
|
||||
version = "10.0.3";
|
||||
version = "11.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "glean_parser";
|
||||
inherit version;
|
||||
hash = "sha256-1XNZYp0pX57lcAaKKEaWaJLj/ttyIlnsvNjMN20pm1E=";
|
||||
hash = "sha256-eeUjtRsP3c6fbGMJ+oxkMou3BrLWyEelP4ipPQFpXkM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-core";
|
||||
version = "0.1.11";
|
||||
version = "0.1.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "langchain_core";
|
||||
inherit version;
|
||||
hash = "sha256-StS1ltv9vIOTyW1AmDuXrsFlqwumZDC+rnPj2HnBOg0=";
|
||||
hash = "sha256-jLVG7tMYAJ7hqKOB0QgHTt3wOVrmHrJD2wDXbh4mXok=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
, pyyaml
|
||||
, rich
|
||||
, typer
|
||||
, tomli-w
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -46,6 +47,7 @@ buildPythonPackage rec {
|
||||
pyyaml
|
||||
rich
|
||||
typer
|
||||
tomli-w
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyformlang";
|
||||
version = "1.0.4";
|
||||
version = "1.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ysX6c8q26bcQyq6GgKBKxTdp00j+4ypb3mgM2cqCmBs=";
|
||||
hash = "sha256-LHQM+Vy8YVfTtpWaveYgBlp74AnS/IF3Y1EbgwVku7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, syrupy
|
||||
@@ -21,6 +22,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-version.patch";
|
||||
url = "https://github.com/darrenburns/rich-pixels/commit/ff1cc3fef789321831f29e9bf282ae6b337eddb2.patch";
|
||||
hash = "sha256-58ZHBNg1RCuOfuE034qF1SbAgoiWMNlSG3c5pCSLUyI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "seaborn";
|
||||
version = "0.13.0";
|
||||
version = "0.13.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "mwaskom";
|
||||
repo = "seaborn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RbtBNKTjUHdCFe1V7IvACgbSNIPhVFMYmtE34GKVIzs=";
|
||||
hash = "sha256-aGIVcdG/XN999nYBHh3lJqGa3QVt0j8kmzaxdkULznY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-confluencebuilder";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sphinxcontrib_confluencebuilder";
|
||||
inherit version;
|
||||
hash = "sha256-Zpe2n131afnq4IhQEEZtquvSEkkjv/uznXt2tQhGfZA=";
|
||||
hash = "sha256-q3+GwMVWMRu4eWwbdXcbPQzpBhBXcZEMFTpbEO+teLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.33.2";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jkUEGaECBNidKreoyezWw7LN38uHqyYo40dOwfuuuI4=";
|
||||
hash = "sha256-LX7yc2FnCiquHV/tESJV/VkuUYXbRNSxmMzVpSz/F8w=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cloudsmith-cli";
|
||||
version = "0.35.2";
|
||||
version = "1.1.1";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "cloudsmith_cli";
|
||||
inherit format version;
|
||||
hash = "sha256-+M4CPveS9dltMI291Atm84T/cf4dPOO3wPvPI15E73Y=";
|
||||
hash = "sha256-evwXXGmGa6V2LhgkmX04E5VvdPxeZzvl4F28auXcSng=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite-web";
|
||||
version = "0.3.6";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg";
|
||||
sha256 = "sha256-VIbmYN6KjCRpE+kvJyBV75deYmh+zRjcQXZ2/7mseYU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ flask peewee pygments ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "antora";
|
||||
version = "3.1.5";
|
||||
version = "3.1.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PCtYV5jPGFja26Dv4kXiaw8ITWR4xzVP/9hc45UWHeg=";
|
||||
hash = "sha256-uGXXp6boS5yYsInSmkI9S0Tn85QGVp/5Fsh1u3G4oPk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-//426AFUoJy7phqbbLdwkJvhOzcYsIumSaeAKefFsf4=";
|
||||
npmDepsHash = "sha256-oWLRAuvWDk7w18qlDH14EE4elX5nhLKHSQANa/kXKvw=";
|
||||
|
||||
# This is to stop tests from being ran, as some of them fail due to trying to query remote repositories
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.19.12";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NQ06esCSU6YPvQ4cMsi3DEFGIQGl8Ff6fhdTxUAyGvo=";
|
||||
hash = "sha256-CJUBjDQAXSUFe37zYGbX6geeEk9goZ/aOalWDHPIZis=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sqlboiler";
|
||||
version = "4.15.0";
|
||||
version = "4.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "volatiletech";
|
||||
repo = "sqlboiler";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MT1tjVCDaFB9HfjlGGnf6jTiPdKcrDamgp2nTpIarqY=";
|
||||
hash = "sha256-MmZ2TZZ06eiz05bkEm6E8tmGRVkInBZJGHbuPN4fMMY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tZ1RQGmeDv4rtdF1WTRQV1K4Xy1AgIatLPPexnHJnkA=";
|
||||
vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA=";
|
||||
|
||||
tags = [
|
||||
"mysql"
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "instawow";
|
||||
version = "v3.1.0";
|
||||
version = "3.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "layday";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xJw/tgHBfOlv5JYsWWdEJ8vpel348YtXCQsaLqgp3Z0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-eBpX+ojlrWwRXuMijnmb4lNlxIJ40Q9RUqS6txPBDiM=";
|
||||
};
|
||||
|
||||
extras = [ ]; # Disable GUI, most dependencies are not packaged.
|
||||
|
||||
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
pname = "steam-runtime";
|
||||
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt
|
||||
version = "0.20220601.1";
|
||||
version = "0.20231127.68515";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
|
||||
sha256 = "sha256-uYauNtbUlvrnATGks7hWy1zt4Y7AEeADrCr1eVylPbY=";
|
||||
sha256 = "sha256-invUOdJGNhrswsj9Vj/bSAkEigWtBQ554sBAyvPf0mk=";
|
||||
name = "scout-runtime-${version}.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@@ -65,4 +65,18 @@
|
||||
name = "export-rt-sched-migrate";
|
||||
patch = ./export-rt-sched-migrate.patch;
|
||||
};
|
||||
|
||||
rust_1_74 = {
|
||||
name = "rust-1.74.patch";
|
||||
patch = fetchpatch {
|
||||
name = "rust-1.74.patch";
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=80fe9e51510b23472ad0f97175556490549ed714";
|
||||
hash = "sha256-yGt7PwqN/G+ZtZSt6eARvVFdkC8tnUiu0Fz4cFCyguM=";
|
||||
};
|
||||
};
|
||||
|
||||
rust_1_75 = {
|
||||
name = "rust-1.75.patch";
|
||||
patch = ./rust-1.75.patch;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,373 @@
|
||||
From 77007eef13d52d0a5df9706d47078c4e1390a0a9 Mon Sep 17 00:00:00 2001
|
||||
From: Miguel Ojeda <ojeda@kernel.org>
|
||||
Date: Sun, 24 Dec 2023 18:21:28 +0100
|
||||
Subject: [PATCH] rust: upgrade to Rust 1.75.0
|
||||
|
||||
This is the next upgrade to the Rust toolchain, from 1.74.1 to 1.75.0
|
||||
(i.e. the latest) [1].
|
||||
|
||||
See the upgrade policy [2] and the comments on the first upgrade in
|
||||
commit 3ed03f4da06e ("rust: upgrade to Rust 1.68.2").
|
||||
|
||||
# Unstable features
|
||||
|
||||
The `const_maybe_uninit_zeroed` unstable feature [3] was stabilized in
|
||||
Rust 1.75.0, which we were using in the PHYLIB abstractions.
|
||||
|
||||
The only unstable features allowed to be used outside the `kernel` crate
|
||||
are still `new_uninit,offset_of`, though other code to be upstreamed
|
||||
may increase the list.
|
||||
|
||||
Please see [4] for details.
|
||||
|
||||
# Other improvements
|
||||
|
||||
Rust 1.75.0 stabilized `pointer_byte_offsets` [5] which we could
|
||||
potentially use as an alternative for `ptr_metadata` in the future.
|
||||
|
||||
# Required changes
|
||||
|
||||
For this upgrade, no changes were required (i.e. on our side).
|
||||
|
||||
# `alloc` upgrade and reviewing
|
||||
|
||||
The vast majority of changes are due to our `alloc` fork being upgraded
|
||||
at once.
|
||||
|
||||
There are two kinds of changes to be aware of: the ones coming from
|
||||
upstream, which we should follow as closely as possible, and the updates
|
||||
needed in our added fallible APIs to keep them matching the newer
|
||||
infallible APIs coming from upstream.
|
||||
|
||||
Instead of taking a look at the diff of this patch, an alternative
|
||||
approach is reviewing a diff of the changes between upstream `alloc` and
|
||||
the kernel's. This allows to easily inspect the kernel additions only,
|
||||
especially to check if the fallible methods we already have still match
|
||||
the infallible ones in the new version coming from upstream.
|
||||
|
||||
Another approach is reviewing the changes introduced in the additions in
|
||||
the kernel fork between the two versions. This is useful to spot
|
||||
potentially unintended changes to our additions.
|
||||
|
||||
To apply these approaches, one may follow steps similar to the following
|
||||
to generate a pair of patches that show the differences between upstream
|
||||
Rust and the kernel (for the subset of `alloc` we use) before and after
|
||||
applying this patch:
|
||||
|
||||
# Get the difference with respect to the old version.
|
||||
git -C rust checkout $(linux/scripts/min-tool-version.sh rustc)
|
||||
git -C linux ls-tree -r --name-only HEAD -- rust/alloc |
|
||||
cut -d/ -f3- |
|
||||
grep -Fv README.md |
|
||||
xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH
|
||||
git -C linux diff --patch-with-stat --summary -R > old.patch
|
||||
git -C linux restore rust/alloc
|
||||
|
||||
# Apply this patch.
|
||||
git -C linux am rust-upgrade.patch
|
||||
|
||||
# Get the difference with respect to the new version.
|
||||
git -C rust checkout $(linux/scripts/min-tool-version.sh rustc)
|
||||
git -C linux ls-tree -r --name-only HEAD -- rust/alloc |
|
||||
cut -d/ -f3- |
|
||||
grep -Fv README.md |
|
||||
xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH
|
||||
git -C linux diff --patch-with-stat --summary -R > new.patch
|
||||
git -C linux restore rust/alloc
|
||||
|
||||
Now one may check the `new.patch` to take a look at the additions (first
|
||||
approach) or at the difference between those two patches (second
|
||||
approach). For the latter, a side-by-side tool is recommended.
|
||||
|
||||
Link: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1750-2023-12-28 [1]
|
||||
Link: https://rust-for-linux.com/rust-version-policy [2]
|
||||
Link: https://github.com/rust-lang/rust/issues/91850 [3]
|
||||
Link: https://github.com/Rust-for-Linux/linux/issues/2 [4]
|
||||
Link: https://github.com/rust-lang/rust/issues/96283 [5]
|
||||
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
|
||||
Link: https://lore.kernel.org/lkml/20231224172128.271447-1-ojeda@kernel.org/
|
||||
Signed-off-by: Alyssa Ross <hi@alyssa.is>
|
||||
---
|
||||
Documentation/process/changes.rst | 2 +-
|
||||
rust/alloc/alloc.rs | 9 ++++++++-
|
||||
rust/alloc/boxed.rs | 20 ++++++++++++--------
|
||||
rust/alloc/lib.rs | 7 ++++---
|
||||
rust/alloc/raw_vec.rs | 19 +++++++++++++++----
|
||||
rust/alloc/vec/mod.rs | 16 ++++++++++------
|
||||
scripts/min-tool-version.sh | 2 +-
|
||||
7 files changed, 51 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/Documentation/process/changes.rst b/Documentation/process/changes.rst
|
||||
index 169f67773518..52284fdbaf23 100644
|
||||
--- a/Documentation/process/changes.rst
|
||||
+++ b/Documentation/process/changes.rst
|
||||
@@ -31,7 +31,7 @@ you probably needn't concern yourself with pcmciautils.
|
||||
====================== =============== ========================================
|
||||
GNU C 5.1 gcc --version
|
||||
Clang/LLVM (optional) 11.0.0 clang --version
|
||||
-Rust (optional) 1.74.1 rustc --version
|
||||
+Rust (optional) 1.75.0 rustc --version
|
||||
bindgen (optional) 0.65.1 bindgen --version
|
||||
GNU make 3.82 make --version
|
||||
bash 4.2 bash --version
|
||||
diff --git a/rust/alloc/alloc.rs b/rust/alloc/alloc.rs
|
||||
index 150e13750ff7..8a6be8c98173 100644
|
||||
--- a/rust/alloc/alloc.rs
|
||||
+++ b/rust/alloc/alloc.rs
|
||||
@@ -379,13 +379,20 @@ const fn ct_error(_: Layout) -> ! {
|
||||
panic!("allocation failed");
|
||||
}
|
||||
|
||||
+ #[inline]
|
||||
fn rt_error(layout: Layout) -> ! {
|
||||
unsafe {
|
||||
__rust_alloc_error_handler(layout.size(), layout.align());
|
||||
}
|
||||
}
|
||||
|
||||
- unsafe { core::intrinsics::const_eval_select((layout,), ct_error, rt_error) }
|
||||
+ #[cfg(not(feature = "panic_immediate_abort"))]
|
||||
+ unsafe {
|
||||
+ core::intrinsics::const_eval_select((layout,), ct_error, rt_error)
|
||||
+ }
|
||||
+
|
||||
+ #[cfg(feature = "panic_immediate_abort")]
|
||||
+ ct_error(layout)
|
||||
}
|
||||
|
||||
// For alloc test `std::alloc::handle_alloc_error` can be used directly.
|
||||
diff --git a/rust/alloc/boxed.rs b/rust/alloc/boxed.rs
|
||||
index 9620eba17268..f5f40778a193 100644
|
||||
--- a/rust/alloc/boxed.rs
|
||||
+++ b/rust/alloc/boxed.rs
|
||||
@@ -161,7 +161,7 @@
|
||||
use core::marker::Unsize;
|
||||
use core::mem::{self, SizedTypeProperties};
|
||||
use core::ops::{
|
||||
- CoerceUnsized, Deref, DerefMut, DispatchFromDyn, Generator, GeneratorState, Receiver,
|
||||
+ CoerceUnsized, Coroutine, CoroutineState, Deref, DerefMut, DispatchFromDyn, Receiver,
|
||||
};
|
||||
use core::pin::Pin;
|
||||
use core::ptr::{self, NonNull, Unique};
|
||||
@@ -211,7 +211,7 @@ impl<T> Box<T> {
|
||||
/// ```
|
||||
/// let five = Box::new(5);
|
||||
/// ```
|
||||
- #[cfg(all(not(no_global_oom_handling)))]
|
||||
+ #[cfg(not(no_global_oom_handling))]
|
||||
#[inline(always)]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[must_use]
|
||||
@@ -2110,28 +2110,28 @@ fn as_mut(&mut self) -> &mut T {
|
||||
#[stable(feature = "pin", since = "1.33.0")]
|
||||
impl<T: ?Sized, A: Allocator> Unpin for Box<T, A> where A: 'static {}
|
||||
|
||||
-#[unstable(feature = "generator_trait", issue = "43122")]
|
||||
-impl<G: ?Sized + Generator<R> + Unpin, R, A: Allocator> Generator<R> for Box<G, A>
|
||||
+#[unstable(feature = "coroutine_trait", issue = "43122")]
|
||||
+impl<G: ?Sized + Coroutine<R> + Unpin, R, A: Allocator> Coroutine<R> for Box<G, A>
|
||||
where
|
||||
A: 'static,
|
||||
{
|
||||
type Yield = G::Yield;
|
||||
type Return = G::Return;
|
||||
|
||||
- fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState<Self::Yield, Self::Return> {
|
||||
+ fn resume(mut self: Pin<&mut Self>, arg: R) -> CoroutineState<Self::Yield, Self::Return> {
|
||||
G::resume(Pin::new(&mut *self), arg)
|
||||
}
|
||||
}
|
||||
|
||||
-#[unstable(feature = "generator_trait", issue = "43122")]
|
||||
-impl<G: ?Sized + Generator<R>, R, A: Allocator> Generator<R> for Pin<Box<G, A>>
|
||||
+#[unstable(feature = "coroutine_trait", issue = "43122")]
|
||||
+impl<G: ?Sized + Coroutine<R>, R, A: Allocator> Coroutine<R> for Pin<Box<G, A>>
|
||||
where
|
||||
A: 'static,
|
||||
{
|
||||
type Yield = G::Yield;
|
||||
type Return = G::Return;
|
||||
|
||||
- fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState<Self::Yield, Self::Return> {
|
||||
+ fn resume(mut self: Pin<&mut Self>, arg: R) -> CoroutineState<Self::Yield, Self::Return> {
|
||||
G::resume((*self).as_mut(), arg)
|
||||
}
|
||||
}
|
||||
@@ -2448,4 +2448,8 @@ fn cause(&self) -> Option<&dyn core::error::Error> {
|
||||
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
|
||||
core::error::Error::source(&**self)
|
||||
}
|
||||
+
|
||||
+ fn provide<'b>(&'b self, request: &mut core::error::Request<'b>) {
|
||||
+ core::error::Error::provide(&**self, request);
|
||||
+ }
|
||||
}
|
||||
diff --git a/rust/alloc/lib.rs b/rust/alloc/lib.rs
|
||||
index 9c7ea73da108..345cf5c9cf92 100644
|
||||
--- a/rust/alloc/lib.rs
|
||||
+++ b/rust/alloc/lib.rs
|
||||
@@ -80,6 +80,8 @@
|
||||
not(no_sync),
|
||||
target_has_atomic = "ptr"
|
||||
))]
|
||||
+#![cfg_attr(not(bootstrap), doc(rust_logo))]
|
||||
+#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
|
||||
#![no_std]
|
||||
#![needs_allocator]
|
||||
// Lints:
|
||||
@@ -115,7 +117,6 @@
|
||||
#![feature(const_eval_select)]
|
||||
#![feature(const_maybe_uninit_as_mut_ptr)]
|
||||
#![feature(const_maybe_uninit_write)]
|
||||
-#![feature(const_maybe_uninit_zeroed)]
|
||||
#![feature(const_pin)]
|
||||
#![feature(const_refs_to_cell)]
|
||||
#![feature(const_size_of_val)]
|
||||
@@ -141,7 +142,7 @@
|
||||
#![feature(maybe_uninit_uninit_array)]
|
||||
#![feature(maybe_uninit_uninit_array_transpose)]
|
||||
#![feature(pattern)]
|
||||
-#![feature(pointer_byte_offsets)]
|
||||
+#![feature(ptr_addr_eq)]
|
||||
#![feature(ptr_internals)]
|
||||
#![feature(ptr_metadata)]
|
||||
#![feature(ptr_sub_ptr)]
|
||||
@@ -168,7 +169,7 @@
|
||||
//
|
||||
// Language features:
|
||||
// tidy-alphabetical-start
|
||||
-#![cfg_attr(not(test), feature(generator_trait))]
|
||||
+#![cfg_attr(not(test), feature(coroutine_trait))]
|
||||
#![cfg_attr(test, feature(panic_update_hook))]
|
||||
#![cfg_attr(test, feature(test))]
|
||||
#![feature(allocator_internals)]
|
||||
diff --git a/rust/alloc/raw_vec.rs b/rust/alloc/raw_vec.rs
|
||||
index a7425582a323..f1b8cec8cc62 100644
|
||||
--- a/rust/alloc/raw_vec.rs
|
||||
+++ b/rust/alloc/raw_vec.rs
|
||||
@@ -338,10 +338,13 @@ pub fn reserve_for_push(&mut self, len: usize) {
|
||||
/// The same as `reserve`, but returns on errors instead of panicking or aborting.
|
||||
pub fn try_reserve(&mut self, len: usize, additional: usize) -> Result<(), TryReserveError> {
|
||||
if self.needs_to_grow(len, additional) {
|
||||
- self.grow_amortized(len, additional)
|
||||
- } else {
|
||||
- Ok(())
|
||||
+ self.grow_amortized(len, additional)?;
|
||||
}
|
||||
+ unsafe {
|
||||
+ // Inform the optimizer that the reservation has succeeded or wasn't needed
|
||||
+ core::intrinsics::assume(!self.needs_to_grow(len, additional));
|
||||
+ }
|
||||
+ Ok(())
|
||||
}
|
||||
|
||||
/// The same as `reserve_for_push`, but returns on errors instead of panicking or aborting.
|
||||
@@ -378,7 +381,14 @@ pub fn try_reserve_exact(
|
||||
len: usize,
|
||||
additional: usize,
|
||||
) -> Result<(), TryReserveError> {
|
||||
- if self.needs_to_grow(len, additional) { self.grow_exact(len, additional) } else { Ok(()) }
|
||||
+ if self.needs_to_grow(len, additional) {
|
||||
+ self.grow_exact(len, additional)?;
|
||||
+ }
|
||||
+ unsafe {
|
||||
+ // Inform the optimizer that the reservation has succeeded or wasn't needed
|
||||
+ core::intrinsics::assume(!self.needs_to_grow(len, additional));
|
||||
+ }
|
||||
+ Ok(())
|
||||
}
|
||||
|
||||
/// Shrinks the buffer down to the specified capacity. If the given amount
|
||||
@@ -569,6 +579,7 @@ fn alloc_guard(alloc_size: usize) -> Result<(), TryReserveError> {
|
||||
// ensure that the code generation related to these panics is minimal as there's
|
||||
// only one location which panics rather than a bunch throughout the module.
|
||||
#[cfg(not(no_global_oom_handling))]
|
||||
+#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
|
||||
fn capacity_overflow() -> ! {
|
||||
panic!("capacity overflow");
|
||||
}
|
||||
diff --git a/rust/alloc/vec/mod.rs b/rust/alloc/vec/mod.rs
|
||||
index 41ca71805ef0..0d95fd7ef337 100644
|
||||
--- a/rust/alloc/vec/mod.rs
|
||||
+++ b/rust/alloc/vec/mod.rs
|
||||
@@ -1376,7 +1376,7 @@ pub fn as_mut_slice(&mut self) -> &mut [T] {
|
||||
/// [`as_mut_ptr`]: Vec::as_mut_ptr
|
||||
/// [`as_ptr`]: Vec::as_ptr
|
||||
#[stable(feature = "vec_as_ptr", since = "1.37.0")]
|
||||
- #[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
|
||||
+ #[rustc_never_returns_null_ptr]
|
||||
#[inline]
|
||||
pub fn as_ptr(&self) -> *const T {
|
||||
// We shadow the slice method of the same name to avoid going through
|
||||
@@ -1436,7 +1436,7 @@ pub fn as_ptr(&self) -> *const T {
|
||||
/// [`as_mut_ptr`]: Vec::as_mut_ptr
|
||||
/// [`as_ptr`]: Vec::as_ptr
|
||||
#[stable(feature = "vec_as_ptr", since = "1.37.0")]
|
||||
- #[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
|
||||
+ #[rustc_never_returns_null_ptr]
|
||||
#[inline]
|
||||
pub fn as_mut_ptr(&mut self) -> *mut T {
|
||||
// We shadow the slice method of the same name to avoid going through
|
||||
@@ -1565,7 +1565,8 @@ pub unsafe fn set_len(&mut self, new_len: usize) {
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
pub fn swap_remove(&mut self, index: usize) -> T {
|
||||
#[cold]
|
||||
- #[inline(never)]
|
||||
+ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
|
||||
+ #[track_caller]
|
||||
fn assert_failed(index: usize, len: usize) -> ! {
|
||||
panic!("swap_remove index (is {index}) should be < len (is {len})");
|
||||
}
|
||||
@@ -1606,7 +1607,8 @@ fn assert_failed(index: usize, len: usize) -> ! {
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
pub fn insert(&mut self, index: usize, element: T) {
|
||||
#[cold]
|
||||
- #[inline(never)]
|
||||
+ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
|
||||
+ #[track_caller]
|
||||
fn assert_failed(index: usize, len: usize) -> ! {
|
||||
panic!("insertion index (is {index}) should be <= len (is {len})");
|
||||
}
|
||||
@@ -1667,7 +1669,7 @@ fn assert_failed(index: usize, len: usize) -> ! {
|
||||
#[track_caller]
|
||||
pub fn remove(&mut self, index: usize) -> T {
|
||||
#[cold]
|
||||
- #[inline(never)]
|
||||
+ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
|
||||
#[track_caller]
|
||||
fn assert_failed(index: usize, len: usize) -> ! {
|
||||
panic!("removal index (is {index}) should be < len (is {len})");
|
||||
@@ -2097,6 +2099,7 @@ pub fn pop(&mut self) -> Option<T> {
|
||||
} else {
|
||||
unsafe {
|
||||
self.len -= 1;
|
||||
+ core::intrinsics::assume(self.len < self.capacity());
|
||||
Some(ptr::read(self.as_ptr().add(self.len())))
|
||||
}
|
||||
}
|
||||
@@ -2299,7 +2302,8 @@ pub fn split_off(&mut self, at: usize) -> Self
|
||||
A: Clone,
|
||||
{
|
||||
#[cold]
|
||||
- #[inline(never)]
|
||||
+ #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
|
||||
+ #[track_caller]
|
||||
fn assert_failed(at: usize, len: usize) -> ! {
|
||||
panic!("`at` split index (is {at}) should be <= len (is {len})");
|
||||
}
|
||||
diff --git a/scripts/min-tool-version.sh b/scripts/min-tool-version.sh
|
||||
index c62066825f53..bcc7d4247290 100755
|
||||
--- a/scripts/min-tool-version.sh
|
||||
+++ b/scripts/min-tool-version.sh
|
||||
@@ -31,7 +31,7 @@ llvm)
|
||||
fi
|
||||
;;
|
||||
rustc)
|
||||
- echo 1.74.1
|
||||
+ echo 1.75.0
|
||||
;;
|
||||
bindgen)
|
||||
echo 0.65.1
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -8,18 +8,18 @@ with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "setools";
|
||||
version = "4.4.1";
|
||||
version = "4.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SELinuxProject";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-4T5FIdnKi35JSm+IoYA2gIBBRV0nN0YLEw9xvDqNcgo=";
|
||||
hash = "sha256-QCJfFdY4THBurx7G8q/WAzb7b9CwtNNGi5fn9D++BMU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
buildInputs = [ libsepol ];
|
||||
propagatedBuildInputs = [ enum34 libselinux networkx ]
|
||||
propagatedBuildInputs = [ enum34 libselinux networkx setuptools ]
|
||||
++ optionals withGraphics [ pyqt5 ];
|
||||
|
||||
nativeCheckInputs = [ tox checkpolicy ];
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
# build+runtime deps.
|
||||
, knot-dns, luajitPackages, libuv, gnutls, lmdb
|
||||
, jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
|
||||
, fstrm, protobufc # more optionals
|
||||
# test-only deps.
|
||||
, cmocka, which, cacert
|
||||
, extraFeatures ? false /* catch-all if defaults aren't enough */
|
||||
@@ -62,9 +63,10 @@ unwrapped = stdenv.mkDerivation rec {
|
||||
|
||||
# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
|
||||
buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
|
||||
## the rest are optional dependencies
|
||||
++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ]
|
||||
++ [ jemalloc nghttp2 ]
|
||||
## optional dependencies; TODO: dnstap
|
||||
++ [ fstrm protobufc ] # dnstap support
|
||||
;
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_wsgi";
|
||||
version = "4.9.4";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrahamDumpleton";
|
||||
repo = "mod_wsgi";
|
||||
rev = version;
|
||||
hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0=";
|
||||
hash = "sha256-/4swm4AYCN3xyz2+OH7XqH/dFC53wqGPZgEAdxZQvbs=";
|
||||
};
|
||||
|
||||
buildInputs = [ apacheHttpd python3 ncurses ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "icingaweb2";
|
||||
version = "2.11.4";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Icinga";
|
||||
repo = "icingaweb2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UMC1puEM0PhIu+lJouOj81tI/E6fz1PzPN0FU7TNwTg=";
|
||||
hash = "sha256-j101HsFvJZrzpK395TF4seztYfCCQKnqrpEpGj5xrtQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "icingaweb2-ipl";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Icinga";
|
||||
repo = "icinga-php-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U3SzjjYoalejPs5hqZP2QyvlKdgdpWk9o0DkFGtWC2w=";
|
||||
hash = "sha256-4f0Xx4mnc+M2i97/TFQeg2rZaJUpKkx1SvpbLWmSYNo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "icingaweb2-thirdparty";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Icinga";
|
||||
repo = "icinga-php-thirdparty";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZKERh8lssN5TF6W2eUY1j+kSslxOmGj72dV45a23o7Q=";
|
||||
sha256 = "sha256-T67DcsHVf3yDQveNtSPqLoOOPuT4ThkUSCJ9aCSVaIc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icinga2${nameSuffix}";
|
||||
version = "2.14.0";
|
||||
version = "2.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "icinga";
|
||||
repo = "icinga2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MrNfkbbmID27Ht2sDSklrPvRvCmewOuOOBIFnHJz1zE=";
|
||||
sha256 = "sha256-vUtLGkTLGObx3zbfRTboNVsl9AmpAkHc+IhWhnKupSM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "afterburn";
|
||||
version = "5.4.3";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "afterburn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IxAmamWJjM8DAEihH3lYgOLKOcSRvh48GSIX797Nhjo=";
|
||||
sha256 = "sha256-3+FlW/y8EScJKaFvxa/hOlDF18kEtz2XyMdrDZgcMXs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vQTxqAnnfjg4zFSOPLIcchRjqv0HJ3L2jBSNubpO9DM=";
|
||||
cargoHash = "sha256-DTFvaXPr21qvx1FA1phueRxTgcrfhGgb9Vktah372Uo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -13,13 +13,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-typing-booster";
|
||||
version = "2.24.11";
|
||||
version = "2.24.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-fabian";
|
||||
repo = "ibus-typing-booster";
|
||||
rev = version;
|
||||
hash = "sha256-qksAtEUdvRddkl1tLfDqGhJDGwT605/IJOuIFVxgI0s=";
|
||||
hash = "sha256-RHmU+wcorC78Pa21DrhOLz3ztv8kByWo5l1i8F/LZO4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "barman";
|
||||
version = "3.7.0";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = pname;
|
||||
rev = "refs/tags/release/${version}";
|
||||
hash = "sha256-5mecCg5c+fu6WUgmNEL4BR+JCild02YAuYgLwO1MGnI=";
|
||||
hash = "sha256-NcDW1SLeP2BVH+TQp1M03Otg75axSFXfwQzlEJ1JOxo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pacparser";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manugarg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p83aAcZ3fGOrokq4HDgF5/VxMl3Q11voSjdaBUUO4S0=";
|
||||
sha256 = "sha256-qIfzAQ/dJgOZJajNU3XyFudSxu2w4JC0ffHosHXje1o=";
|
||||
};
|
||||
|
||||
makeFlags = [ "NO_INTERNET=1" ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quark-engine";
|
||||
version = "23.9.1";
|
||||
version = "23.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-E9efhgMGN9lvMlFeZqo6xco75TtQsXULOzKX00pjqMM=";
|
||||
sha256 = "sha256-NeJGkqGpg2uOsz10gEYz/nzh21DhXSU4RgQtI1brASQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@@ -26,7 +26,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
plotly
|
||||
prettytable
|
||||
prompt-toolkit
|
||||
r2pipe
|
||||
rzpipe
|
||||
setuptools
|
||||
tqdm
|
||||
];
|
||||
|
||||
|
||||
@@ -190,6 +190,8 @@ in {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.rust_1_74
|
||||
kernelPatches.rust_1_75
|
||||
];
|
||||
};
|
||||
|
||||
@@ -201,6 +203,7 @@ in {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.rust_1_75
|
||||
];
|
||||
};
|
||||
latest = packageAliases.linux_latest.kernel;
|
||||
|
||||
@@ -1757,6 +1757,10 @@ let
|
||||
|
||||
timed = callPackage ../development/ocaml-modules/timed { };
|
||||
|
||||
timedesc = callPackage ../development/ocaml-modules/timedesc { };
|
||||
timedesc-tzdb = callPackage ../development/ocaml-modules/timedesc/tzdb.nix { };
|
||||
timedesc-tzlocal = callPackage ../development/ocaml-modules/timedesc/tzlocal.nix { };
|
||||
|
||||
tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { };
|
||||
|
||||
tls = callPackage ../development/ocaml-modules/tls { };
|
||||
|
||||
@@ -617,6 +617,8 @@ self: super: with self; {
|
||||
|
||||
aocd = callPackage ../development/python-modules/aocd { };
|
||||
|
||||
aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { };
|
||||
|
||||
apache-beam = callPackage ../development/python-modules/apache-beam { };
|
||||
|
||||
apcaccess = callPackage ../development/python-modules/apcaccess { };
|
||||
|
||||
Reference in New Issue
Block a user