Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
be318b7673
@ -86,6 +86,23 @@ meta.platforms = lib.platforms.linux;
|
||||
|
||||
Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types.
|
||||
|
||||
### `badPlatforms` {#var-meta-badPlatforms}
|
||||
|
||||
The list of Nix [platform types](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L75-L81) on which the package is known not to be buildable.
|
||||
Hydra will never create prebuilt binaries for these platform types, even if they are in [`meta.platforms`](#var-meta-platforms).
|
||||
In general it is preferable to set `meta.platforms = lib.platforms.all` and then exclude any platforms on which the package is known not to build.
|
||||
For example, a package which requires dynamic linking and cannot be linked statically could use this:
|
||||
|
||||
```nix
|
||||
meta.platforms = lib.platforms.all;
|
||||
meta.badPlatforms = [ lib.systems.inspect.patterns.isStatic ];
|
||||
```
|
||||
|
||||
The [`lib.meta.availableOn`](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L95-L106) function can be used to test whether or not a package is available (i.e. buildable) on a given platform.
|
||||
Some packages use this to automatically detect the maximum set of features with which they can be built.
|
||||
For example, `systemd` [requires dynamic linking](https://github.com/systemd/systemd/issues/20600#issuecomment-912338965), and [has a `meta.badPlatforms` setting](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/pkgs/os-specific/linux/systemd/default.nix#L752) similar to the one above.
|
||||
Packages which can be built with or without `systemd` support will use `lib.meta.availableOn` to detect whether or not `systemd` is available on the [`hostPlatform`](#ssec-cross-platform-parameters) for which they are being built; if it is not available (e.g. due to a statically-linked host platform like `pkgsStatic`) this support will be disabled by default.
|
||||
|
||||
### `tests` {#var-meta-tests}
|
||||
|
||||
::: {.warning}
|
||||
@ -173,7 +190,7 @@ To be effective, it must be presented directly to an evaluation process that han
|
||||
|
||||
### `hydraPlatforms` {#var-meta-hydraPlatforms}
|
||||
|
||||
The list of Nix platform types for which the Hydra instance at `hydra.nixos.org` will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g.
|
||||
The list of Nix platform types for which the [Hydra](https://github.com/nixos/hydra) [instance at `hydra.nixos.org`](https://nixos.org/hydra) will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g.
|
||||
|
||||
```nix
|
||||
meta.platforms = lib.platforms.linux;
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
let
|
||||
pname = "framesh";
|
||||
version = "0.5.0-beta.22";
|
||||
version = "0.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
|
||||
sha256 = "sha256-/y7Pf1ADtz0CBeKKCHtSPOYvU7HCpq7hM/J4Ddq1XiA=";
|
||||
sha256 = "sha256-nN5+6SwfHcwhePlbsXjT3qNd/d6Xqnd85NVC8vw3ehk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
, tl-expected
|
||||
, hunspell
|
||||
, glibmm_2_68
|
||||
, webkitgtk_4_1
|
||||
, webkitgtk_6_0
|
||||
, jemalloc
|
||||
, rnnoise
|
||||
, protobuf
|
||||
@ -73,7 +73,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.7.1";
|
||||
version = "4.8.0";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk";
|
||||
sha256 = "1ari4kdjd99klrla0rn4cjjc54d6glf17s0q881f67vh2v5zdwf0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -101,8 +101,8 @@ stdenv.mkDerivation rec {
|
||||
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
|
||||
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
|
||||
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \
|
||||
--replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"'
|
||||
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \
|
||||
--replace '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
|
||||
'';
|
||||
|
||||
# We want to run wrapProgram manually (with additional parameters)
|
||||
@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
|
||||
tl-expected
|
||||
hunspell
|
||||
glibmm_2_68
|
||||
webkitgtk_4_1
|
||||
webkitgtk_6_0
|
||||
jemalloc
|
||||
rnnoise
|
||||
protobuf
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2023-03-14";
|
||||
version = "unstable-2023-04-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "1a18da2ed4d5ce134e984d1586b915738e0da257";
|
||||
sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3";
|
||||
rev = "fe316b0c5a155cceb2ddecee70d7b582cadfa225";
|
||||
sha256 = "0wl2d1ycvf32prqjxxh6a14zgaqkk7s545cv2pn4dryn6lf7bfsp";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -12,13 +12,13 @@ assert (blas.isILP64 == arpack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octopus";
|
||||
version = "12.1";
|
||||
version = "12.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "octopus-code";
|
||||
repo = "octopus";
|
||||
rev = version;
|
||||
sha256 = "sha256-dQdb4wGKOQefrgtQVorq6EH9IiAh1tMmj3GiZOXgTBY=";
|
||||
sha256 = "sha256-tM3D0geOT+8X3EofI+iPR48z8LKFSxQMoO/W/be+OFg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,11 +19,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gromacs";
|
||||
version = "2023";
|
||||
version = "2023.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";
|
||||
sha256 = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g=";
|
||||
sha256 = "sha256-7vK7Smy2MUz52kfybfKg0nr0v3swmXI9Q2AQc6sKQvQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
142
pkgs/development/libraries/lightgbm/default.nix
Normal file
142
pkgs/development/libraries/lightgbm/default.nix
Normal file
@ -0,0 +1,142 @@
|
||||
{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true
|
||||
, cudaSupport ? config.cudaSupport or false, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false
|
||||
, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }:
|
||||
|
||||
assert doCheck -> mpiSupport != true;
|
||||
assert openclSupport -> cudaSupport != true;
|
||||
assert cudaSupport -> openclSupport != true;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pnameBase = "lightgbm";
|
||||
# prefix with r when building the R library
|
||||
# The R package build results in a special binary file
|
||||
# that contains a subset of the .so file use for the CLI
|
||||
# and python version. In general, the CRAN version from
|
||||
# nixpkgs's r-modules should be used, but this non-standard
|
||||
# build allows for enabling CUDA support and other features
|
||||
# which aren't included in the CRAN release. Build with:
|
||||
# nix-build -E "with (import $NIXPKGS{}); \
|
||||
# let \
|
||||
# lgbm = lightgbm.override{rLibrary = true; doCheck = false;}; \
|
||||
# in \
|
||||
# rWrapper.override{ packages = [ lgbm ]; }"
|
||||
pname = lib.optionalString rLibrary "r-" + pnameBase;
|
||||
version = "3.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pnameBase;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-QRuBbMVtD5J5ECw+bAp57bWaRc/fATMcTq+AKikhj1I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]
|
||||
++ lib.optionals openclSupport [ opencl-headers ocl-icd boost ]
|
||||
++ lib.optionals mpiSupport [ openmpi ]
|
||||
++ lib.optionals hdfsSupport [ hadoop ]
|
||||
++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ]
|
||||
++ lib.optionals javaWrapper [ swig ]
|
||||
++ lib.optionals rLibrary [ R ];
|
||||
|
||||
buildInputs = [ gtest ]
|
||||
++ lib.optional cudaSupport cudaPackages.cudatoolkit;
|
||||
|
||||
propagatedBuildInputs = lib.optionals rLibrary [
|
||||
rPackages.data_table
|
||||
rPackages.jsonlite
|
||||
rPackages.Matrix
|
||||
rPackages.R6
|
||||
];
|
||||
|
||||
# Skip APPLE in favor of linux build for .so files
|
||||
postPatch = ''
|
||||
export PROJECT_SOURCE_DIR=./
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "find_package(GTest CONFIG)" "find_package(GTest REQUIRED)" \
|
||||
--replace "OpenCL_INCLUDE_DIRS}" "OpenCL_INCLUDE_DIRS}" \
|
||||
--replace "elseif(APPLE)" "elseif(APPLESKIP)"
|
||||
substituteInPlace \
|
||||
external_libs/compute/include/boost/compute/cl.hpp \
|
||||
external_libs/compute/include/boost/compute/cl_ext.hpp \
|
||||
--replace "include <OpenCL/" "include <CL/"
|
||||
substituteInPlace build_r.R \
|
||||
--replace "file.path(getwd(), \"lightgbm_r\")" "'$out/tmp'" \
|
||||
--replace \
|
||||
"install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", tarball)" \
|
||||
"install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", \"-l $out/library\", tarball)"
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optionals doCheck [ "-DBUILD_CPP_TEST=ON" ]
|
||||
++ lib.optionals cudaSupport [ "-DUSE_CUDA=1" "-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ]
|
||||
++ lib.optionals openclSupport [ "-DUSE_GPU=ON" ]
|
||||
++ lib.optionals mpiSupport [ "-DUSE_MPI=ON" ]
|
||||
++ lib.optionals hdfsSupport [
|
||||
"-DUSE_HDFS=ON"
|
||||
"-DHDFS_LIB=${hadoop}/lib/hadoop-3.3.1/lib/native/libhdfs.so"
|
||||
"-DHDFS_INCLUDE_DIR=${hadoop}/lib/hadoop-3.3.1/include" ]
|
||||
++ lib.optionals javaWrapper [ "-DUSE_SWIG=ON" ]
|
||||
++ lib.optionals rLibrary [ "-D__BUILD_FOR_R=ON" ];
|
||||
|
||||
configurePhase = lib.optionals rLibrary ''
|
||||
export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}"
|
||||
'';
|
||||
|
||||
# set the R package buildPhase to null because lightgbm has a
|
||||
# custom builder script that builds and installs in one step
|
||||
buildPhase = lib.optionals rLibrary ''
|
||||
'';
|
||||
|
||||
inherit doCheck;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
'' + lib.optionalString (!rLibrary) ''
|
||||
mkdir -p $out
|
||||
mkdir -p $out/lib
|
||||
mkdir -p $out/bin
|
||||
cp -r ../include $out
|
||||
install -Dm755 ../lib_lightgbm.so $out/lib/lib_lightgbm.so
|
||||
install -Dm755 ../lightgbm $out/bin/lightgbm
|
||||
'' + lib.optionalString javaWrapper ''
|
||||
cp -r java $out
|
||||
cp -r com $out
|
||||
cp -r lightgbmlib.jar $out
|
||||
'' + ''
|
||||
'' + lib.optionalString javaWrapper ''
|
||||
cp -r java $out
|
||||
cp -r com $out
|
||||
cp -r lightgbmlib.jar $out
|
||||
'' + lib.optionalString rLibrary ''
|
||||
mkdir $out
|
||||
mkdir $out/tmp
|
||||
mkdir $out/library
|
||||
mkdir $out/library/lightgbm
|
||||
'' + lib.optionalString (rLibrary && (!openclSupport)) ''
|
||||
Rscript build_r.R
|
||||
rm -rf $out/tmp
|
||||
'' + lib.optionalString (rLibrary && openclSupport) ''
|
||||
Rscript build_r.R --use-gpu \
|
||||
--opencl-library=${ocl-icd}/lib/libOpenCL.so \
|
||||
--boost-librarydir=${boost}
|
||||
rm -rf $out/tmp
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString rLibrary ''
|
||||
if test -e $out/nix-support/propagated-build-inputs; then
|
||||
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"LightGBM is a gradient boosting framework that uses tree based learning algorithms.";
|
||||
homepage = "https://github.com/microsoft/LightGBM";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ nviets ];
|
||||
};
|
||||
}
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ntirpc";
|
||||
version = "4.3";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nfs-ganesha";
|
||||
repo = "ntirpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P9+t9dTiEKjloulypWPJ4sXWWemq9zPUH/Kctvq1SUQ=";
|
||||
sha256 = "sha256-xqnfo07EHwendzibIz187vdaenHwxg078D6zJvoyewc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
let
|
||||
latex = lib.optionalAttrs buildDocs texlive.combine {
|
||||
inherit (texlive) scheme-small
|
||||
changepage
|
||||
latexmk
|
||||
varwidth
|
||||
multirow
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyblake2";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f";
|
||||
};
|
||||
|
||||
# requires setting up sphinx doctest
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "BLAKE2 hash function extension module";
|
||||
license = lib.licenses.publicDomain;
|
||||
homepage = "https://github.com/dchest/pyblake2";
|
||||
};
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinsteon";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-K8uMyMNZwe6Zr/Qb98wmTLz2+45bx7cmoApnUW5oNPw=";
|
||||
hash = "sha256-5c2hcW9XSEyIMlyrn70U7tgBWdxGrtJoQkjkYzlrbKE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylitterbot";
|
||||
version = "2023.1.2";
|
||||
version = "2023.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "natekspencer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM=";
|
||||
hash = "sha256-nF6njY2qNoHW2ZGNDHNeTBTjSBbitJxitPgyayLaqSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
, mnemonic
|
||||
, pillow
|
||||
, protobuf
|
||||
, pyblake2
|
||||
, requests
|
||||
, shamir-mnemonic
|
||||
, simple-rlp
|
||||
@ -47,7 +46,6 @@ buildPythonPackage rec {
|
||||
mnemonic
|
||||
pillow
|
||||
protobuf
|
||||
pyblake2
|
||||
requests
|
||||
shamir-mnemonic
|
||||
simple-rlp
|
||||
|
||||
@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttp";
|
||||
version = "0.9.2";
|
||||
version = "0.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmulyalin";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KhQRC4zcLCnYUtQm08wJzb/YwBquOEGR5L0YUmnzheg=";
|
||||
hash = "sha256-iZJ38NQnofW9awisY5cFBIN1rjXinA6CpJYSCCnNaOY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -102,6 +102,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/dmulyalin/ttp/releases/tag/${version}";
|
||||
description = "Template Text Parser";
|
||||
homepage = "https://github.com/dmulyalin/ttp";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -1,27 +1,28 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cython
|
||||
, certifi
|
||||
, CFNetwork
|
||||
, cmake
|
||||
, CoreFoundation
|
||||
, enum34
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, libcxxabi
|
||||
, openssl
|
||||
, Security
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uamqp";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IYMzJDXveIL60ick4/L2PT/VpRx/DGNdY0h5SLAuN0k=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-uamqp-python";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-OjZTroaBuUB/dakl5gAYigJkim9EFiCwUEBo7z35vhQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
@ -43,9 +44,12 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
cython
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
CFNetwork
|
||||
Security
|
||||
@ -53,10 +57,6 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
openssl
|
||||
six
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
enum34
|
||||
];
|
||||
|
||||
LDFLAGS = lib.optionals stdenv.isDarwin [
|
||||
@ -65,8 +65,15 @@ buildPythonPackage rec {
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
preCheck = ''
|
||||
# remove src module, so tests use the installed module instead
|
||||
rm -r uamqp
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"uamqp"
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "muon"
|
||||
+ lib.optionalString embedSamurai "-embedded-samurai";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
name = "muon-src";
|
||||
owner = "~lattis";
|
||||
repo = "muon";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-m382/Y+qOYk7hHdDdOpiYWNWrqpnWPCG4AKGGkmLt4o=";
|
||||
hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ];
|
||||
@ -52,14 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# URLs manually extracted from subprojects directory
|
||||
meson-docs-wrap = fetchurl {
|
||||
name = "meson-docs-wrap";
|
||||
url = "https://mochiro.moe/wrap/meson-docs-0.63.0-239-g41a05ff93.tar.gz";
|
||||
hash = "sha256-wg2mDkrkE1xVNXJf4sVm6cN1ozVeDbbw0CBYtixg5/Q=";
|
||||
url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz";
|
||||
hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI=";
|
||||
};
|
||||
|
||||
samurai-wrap = fetchurl {
|
||||
name = "samurai-wrap";
|
||||
url = "https://mochiro.moe/wrap/samurai-1.2-28-g4e3a595.tar.gz";
|
||||
hash = "sha256-TZAEwndVgoWr/zhykfr0wcz9wM96yG44GfzM5p9TpBo=";
|
||||
url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz";
|
||||
hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc=";
|
||||
};
|
||||
in ''
|
||||
pushd $sourceRoot/subprojects
|
||||
|
||||
1995
pkgs/development/tools/misc/texlab/Cargo.lock
generated
1995
pkgs/development/tools/misc/texlab/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -15,21 +15,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "5.4.1";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "texlab";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-rTYcYq8SL404A/ke5Rb9QcCtwHKhs+84TQGNqRn11HM=";
|
||||
hash = "sha256-xff6Wj1ZYn3jGrj/snr4ATabLUmL1Jw2LjsjpoG3ZjI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"salsa-2022-0.1.0" = "sha256-GupU78LkQGUQ+GzqAVZZlNKL1zZkmdqJz9+81ROXDqE=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-gEwsnVXY84mTO+JZvcI7EEYCOnVFM07m4VvcWI6zFT0=";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
||||
|
||||
@ -46,7 +41,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# generate the man page
|
||||
postInstall = lib.optionalString (!isCross) ''
|
||||
# TexLab builds man page separately in CI:
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.4.0/.github/workflows/publish.yml#L127-L131
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.5.0/.github/workflows/publish.yml#L127-L131
|
||||
help2man --no-info "$out/bin/texlab" > texlab.1
|
||||
installManPage texlab.1
|
||||
'';
|
||||
@ -55,7 +50,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation of the Language Server Protocol for LaTeX";
|
||||
homepage = "https://texlab.netlify.app";
|
||||
homepage = "https://github.com/latex-lsp/texlab";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar kira-bruneau ];
|
||||
platforms = platforms.all;
|
||||
|
||||
36
pkgs/development/tools/rye/default.nix
Normal file
36
pkgs/development/tools/rye/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, openssl
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rye";
|
||||
version = "unstable-2023-04-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "rye";
|
||||
rev = "b3fe43a4e462d10784258cad03c19c9738367346";
|
||||
hash = "sha256-q9/VUWyrP/NsuLYY1+/5teYvDJGq646WbMXptnUUUyw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eyJ6gXFVnSC1aEt5YLl5rFoa3+M73smu5wJdAN15HQM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin SystemConfiguration;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to easily manage python dependencies and environments";
|
||||
homepage = "https://github.com/mitsuhiko/rye";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@ -24,10 +24,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
defaultVersion = "2022.10";
|
||||
defaultVersion = "2023.01";
|
||||
defaultSrc = fetchurl {
|
||||
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
|
||||
hash = "sha256-ULRIKlBbwoG6hHDDmaPCbhReKbI1ALw1xQ3r1/pGvfg=";
|
||||
hash = "sha256-aUI7rTgPiaCRZjbonm3L0uRRLVhDCNki0QOdHkMxlQ8=";
|
||||
};
|
||||
buildUBoot = lib.makeOverridable ({
|
||||
version ? null
|
||||
|
||||
18
pkgs/os-specific/linux/kernel/linux-6.3.nix
Normal file
18
pkgs/os-specific/linux/kernel/linux-6.3.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ lib, fetchurl, buildLinux, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.3";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "sha256-ujSR9e1r0nCjcMRAQ049aQhfzdUoki+gHnPXZX23Ox4=";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.24";
|
||||
hash = "sha256-mLhuyASE/3kv5MD1v5pwHDkL0m7bTaRuAitG3junRyU=";
|
||||
version = "6.1.25";
|
||||
hash = "sha256-Cn8NAVdfL2VJIPuZ3tANxB3VyQI0X2/YZG0/4r/ccYg=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.2.11";
|
||||
hash = "sha256-rwFlSv5SUwhr8U4mvOGCMKYuU5xVKC7UYRemf7DKwr0=";
|
||||
version = "6.2.12";
|
||||
hash = "sha256-K/s1nSLOrzZ/A3pnv9qFs8SkI9R6keG0WGV1o7K6jUQ=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@ -20,12 +20,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xp-pen-deco-01-v2-driver";
|
||||
version = "3.2.3.220323-1";
|
||||
version = "3.3.9.230222-1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.xp-pen.com/download/file/id/1936/pid/440/ext/gz.html#.tar.gz";
|
||||
name = "xp-pen-deco-01-v2-driver-${version}.tar.gz";
|
||||
sha256 = "sha256-n/yutkRsjcIRRhB4q1yqEmaa03/1SO8RigJi/ZkfLbk=";
|
||||
sha256 = "sha256-xrRDxH7e00dISXb+lTtrnui+fNFpX7bLke2o+aTjJNk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.4.5";
|
||||
version = "2023.4.6";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@ -310,7 +310,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.4.5";
|
||||
hassVersion = "2023.4.6";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -326,7 +326,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nQ41tHIwmARVOGE4bi22zag4uN+6rPXJ6aDr+018fIw=";
|
||||
hash = "sha256-054MOhLU7sImD5Sl5vUuik6mt7GCupMeBI2pdtpWuls=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
@ -334,7 +334,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tFbgQ0e+J3/ERqlAKKXafWDaFIEIGsqX+uw8/bQyO5A=";
|
||||
hash = "sha256-/SYJUW028HvxLMNHhm6cqQ6jv0J+8NatbZ7h7HyGYXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.4.5";
|
||||
version = "2023.4.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-uZuJ2k52p2fuT15srSifdiD/T0Vk9GUhCh7jY9/nV6o=";
|
||||
hash = "sha256-uPSES/yK6pgZJ68tRgmWuAwitlBOhYxMWPIi2tcEPh8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfs-ganesha";
|
||||
version = "4.4";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nfs-ganesha";
|
||||
repo = "nfs-ganesha";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-MEPy2TXVTegwCpuaIrMol7ag8anxxdcj11z5eYNkDqQ=";
|
||||
sha256 = "sha256-uJlT0nH3n0zzCVOap7XlxilHqSfklHn0h49He1yZkbs=";
|
||||
};
|
||||
|
||||
preConfigure = "cd src";
|
||||
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
"-DUSE_SYSTEM_NTIRPC=ON"
|
||||
"-DSYSSTATEDIR=/var"
|
||||
"-DENABLE_VFS_POSIX_ACL=ON"
|
||||
"-DUSE_ACL_MAPPING=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsocket";
|
||||
version = "1.4.39";
|
||||
version = "1.4.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hackerschoice";
|
||||
repo = "gsocket";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iSII21X3F4Cb1UqF0aYw23N7CyeTQMmziRioEULx9Zk=";
|
||||
hash = "sha256-pY4tjrMbx+OxkJfr8czo5fbhfcmJbiNX4B+FibzUc7w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -24,19 +24,19 @@ let
|
||||
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; };
|
||||
|
||||
version = "2023.2.0";
|
||||
version = "2023.3.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
sha256 = "/k2r+TikxVGlz8cnOq5zF3oUYw4zj31vDAD7OQFQlC4=";
|
||||
sha256 = "sha256-KQDM7XDUA+yRv8y1K//rMCs4J36df42RVsiAXazJeYQ=";
|
||||
};
|
||||
|
||||
desktop-native = rustPlatform.buildRustPackage rec {
|
||||
desktop-native = rustPlatform.buildRustPackage {
|
||||
pname = "bitwarden-desktop-native";
|
||||
inherit src version;
|
||||
sourceRoot = "source/apps/desktop/desktop_native";
|
||||
cargoSha256 = "sha256-zLftfmWYYUAaMvIT21qhVsHzxnNdQhFBH0fRBwVduAc=";
|
||||
cargoSha256 = "sha256-XsAmVYWPPnY0cgBzpO2aWx/fh85fKr8kMO98cDMzOKk=";
|
||||
|
||||
patchFlags = [ "-p4" ];
|
||||
|
||||
@ -91,7 +91,7 @@ buildNpmPackage' {
|
||||
npmBuildFlags = [
|
||||
"--workspace apps/desktop"
|
||||
];
|
||||
npmDepsHash = "sha256-aFjN1S0+lhHjK3VSYfx0F5X8wSJwRRr6zQpPGt2VpxE=";
|
||||
npmDepsHash = "sha256-RmkTWhakZstCCMLQ3iJ8KD5Yt5ZafXc8NDgncJMLaxs=";
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
|
||||
@ -913,6 +913,7 @@ mapAliases ({
|
||||
linuxPackages_6_0 = linuxKernel.packages.linux_6_0;
|
||||
linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
|
||||
linuxPackages_6_2 = linuxKernel.packages.linux_6_2;
|
||||
linuxPackages_6_3 = linuxKernel.packages.linux_6_3;
|
||||
linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;
|
||||
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
|
||||
linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
|
||||
@ -935,6 +936,7 @@ mapAliases ({
|
||||
linux_6_0 = linuxKernel.kernels.linux_6_0;
|
||||
linux_6_1 = linuxKernel.kernels.linux_6_1;
|
||||
linux_6_2 = linuxKernel.kernels.linux_6_2;
|
||||
linux_6_3 = linuxKernel.kernels.linux_6_3;
|
||||
linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
|
||||
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
|
||||
linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
|
||||
|
||||
@ -18846,6 +18846,10 @@ with pkgs;
|
||||
|
||||
rufo = callPackage ../development/tools/rufo { };
|
||||
|
||||
rye = callPackage ../development/tools/rye {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
};
|
||||
|
||||
samurai = callPackage ../development/tools/build-managers/samurai { };
|
||||
|
||||
muon = callPackage ../development/tools/build-managers/muon { };
|
||||
@ -25193,6 +25197,8 @@ with pkgs;
|
||||
nodejs = nodejs-14_x;
|
||||
};
|
||||
|
||||
lightgbm = callPackage ../development/libraries/lightgbm { };
|
||||
|
||||
lighttpd = callPackage ../servers/http/lighttpd { };
|
||||
|
||||
listmonk = callPackage ../servers/mail/listmonk { };
|
||||
|
||||
@ -189,6 +189,14 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
];
|
||||
};
|
||||
|
||||
linux_testing = let
|
||||
testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
|
||||
kernelPatches = [
|
||||
@ -565,6 +573,7 @@ in {
|
||||
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
||||
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
|
||||
linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2);
|
||||
linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3);
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
|
||||
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
|
||||
@ -632,7 +641,7 @@ in {
|
||||
packageAliases = {
|
||||
linux_default = packages.linux_6_1;
|
||||
# Update this when adding the newest kernel major version!
|
||||
linux_latest = packages.linux_6_2;
|
||||
linux_latest = packages.linux_6_3;
|
||||
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
|
||||
linux_rt_default = packages.linux_rt_5_4;
|
||||
linux_rt_latest = packages.linux_rt_6_1;
|
||||
|
||||
@ -186,6 +186,7 @@ mapAliases ({
|
||||
pushbullet = pushbullet-py; # Added 2022-10-15
|
||||
Pweave = pweave; # added 2023-02-19
|
||||
pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
|
||||
pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
|
||||
pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
|
||||
PyGithub = pygithub; # added 2023-02-19
|
||||
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
|
||||
|
||||
@ -8018,8 +8018,6 @@ self: super: with self; {
|
||||
|
||||
pyblackbird = callPackage ../development/python-modules/pyblackbird { };
|
||||
|
||||
pyblake2 = callPackage ../development/python-modules/pyblake2 { };
|
||||
|
||||
pyblock = toPythonModule (callPackage ../development/python-modules/pyblock { });
|
||||
|
||||
pybluez = callPackage ../development/python-modules/pybluez {
|
||||
@ -12208,7 +12206,6 @@ self: super: with self; {
|
||||
rustworkx = callPackage ../development/python-modules/rustworkx { };
|
||||
|
||||
uamqp = callPackage ../development/python-modules/uamqp {
|
||||
openssl = pkgs.openssl_1_1;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user