Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f8c265f433
137 changed files with 717 additions and 466 deletions
4
.github/CODEOWNERS
vendored
4
.github/CODEOWNERS
vendored
|
|
@ -285,3 +285,7 @@
|
|||
/nixos/modules/services/misc/matrix-conduit.nix @piegamesde
|
||||
/nixos/tests/matrix-appservice-irc.nix @piegamesde
|
||||
/nixos/tests/matrix-conduit.nix @piegamesde
|
||||
|
||||
# Dotnet
|
||||
/pkgs/build-support/dotnet @IvarWithoutBones
|
||||
/pkgs/development/compilers/dotnet @IvarWithoutBones
|
||||
|
|
|
|||
|
|
@ -1018,7 +1018,7 @@ in
|
|||
inherit configIniOfService;
|
||||
mainService = mkMerge [ baseService {
|
||||
serviceConfig.StateDirectory = [ "sourcehut/gitsrht" "sourcehut/gitsrht/repos" ];
|
||||
preStart = mkIf (!versionAtLeast config.system.stateVersion "22.05") (mkBefore ''
|
||||
preStart = mkIf (versionOlder config.system.stateVersion "22.05") (mkBefore ''
|
||||
# Fix Git hooks of repositories pre-dating https://github.com/NixOS/nixpkgs/pull/133984
|
||||
(
|
||||
set +f
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "pure-maps";
|
||||
version = "2.9.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "pure-maps";
|
||||
rev = version;
|
||||
hash = "sha256-pMPjY6OXR6THiSQZ4mw9Kz+tAXJaOwzJEcpPOyZ+YKI=";
|
||||
hash = "sha256-r36/Vpt4ZIWV1+VhqRBuo4uT7nmEGiFGIt3QGG3ijjs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -37,6 +37,7 @@ mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Display vector and raster maps, places, routes, and provide navigation instructions with a flexible selection of data and service providers";
|
||||
homepage = "https://github.com/rinigus/pure-maps";
|
||||
changelog = "https://github.com/rinigus/pure-maps/blob/${src.rev}/NEWS.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.Thra11 ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "stellarium";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stellarium";
|
||||
repo = "stellarium";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-scG/SS9emEmrZunv6n3Vzcchoh0Cf9rDOkuxAMnxNk4=";
|
||||
sha256 = "sha256-zDYZBV/76BDWWfiug0fFvMe3pdE4xfKgSmVJJd3Qu9Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ let
|
|||
args.version;
|
||||
version = fetched.version;
|
||||
coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev");
|
||||
versionAtLeast = v: (coq-version == "dev") || (lib.versionAtLeast coq-version v);
|
||||
ideFlags = optionalString (buildIde && !versionAtLeast "8.10")
|
||||
coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v;
|
||||
ideFlags = optionalString (buildIde && !coqAtLeast "8.10")
|
||||
"-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt";
|
||||
csdpPatch = if csdp != null then ''
|
||||
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
|
||||
|
|
@ -71,11 +71,11 @@ let
|
|||
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
|
||||
] ocamlPackages_4_12;
|
||||
ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
|
||||
++ optional (versionAtLeast "8.14") ocamlPackages.dune_2;
|
||||
++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
|
||||
ocamlBuildInputs = []
|
||||
++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5
|
||||
++ optional (!versionAtLeast "8.13") ocamlPackages.num
|
||||
++ optional (versionAtLeast "8.13") ocamlPackages.zarith;
|
||||
++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
|
||||
++ optional (!coqAtLeast "8.13") ocamlPackages.num
|
||||
++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
|
||||
self = stdenv.mkDerivation {
|
||||
pname = "coq";
|
||||
inherit (fetched) version src;
|
||||
|
|
@ -134,11 +134,11 @@ self = stdenv.mkDerivation {
|
|||
nativeBuildInputs = [ pkg-config ]
|
||||
++ ocamlNativeBuildInputs
|
||||
++ optional buildIde copyDesktopItems
|
||||
++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook
|
||||
++ optional (!versionAtLeast "8.6") gnumake42;
|
||||
++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook
|
||||
++ optional (!coqAtLeast "8.6") gnumake42;
|
||||
buildInputs = [ ncurses ] ++ ocamlBuildInputs
|
||||
++ optionals buildIde
|
||||
(if versionAtLeast "8.10"
|
||||
(if coqAtLeast "8.10"
|
||||
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ]
|
||||
else [ ocamlPackages.lablgtk ])
|
||||
;
|
||||
|
|
@ -147,7 +147,7 @@ self = stdenv.mkDerivation {
|
|||
UNAME=$(type -tp uname)
|
||||
RM=$(type -tp rm)
|
||||
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
|
||||
${if !versionAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""}
|
||||
${if !coqAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""}
|
||||
${csdpPatch}
|
||||
'';
|
||||
|
||||
|
|
@ -161,7 +161,7 @@ self = stdenv.mkDerivation {
|
|||
addEnvHooks "$targetOffset" addCoqPath
|
||||
'';
|
||||
|
||||
preConfigure = if versionAtLeast "8.10" then ''
|
||||
preConfigure = if coqAtLeast "8.10" then ''
|
||||
patchShebangs dev/tools/
|
||||
'' else ''
|
||||
configureFlagsArray=(
|
||||
|
|
@ -171,7 +171,7 @@ self = stdenv.mkDerivation {
|
|||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!versionAtLeast "8.14") "bin/votour";
|
||||
buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!coqAtLeast "8.14") "bin/votour";
|
||||
enableParallelBuilding = true;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
|
@ -185,10 +185,10 @@ self = stdenv.mkDerivation {
|
|||
categories = [ "Development" "Science" "Math" "IDE" "GTK" ];
|
||||
});
|
||||
|
||||
postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in ''
|
||||
postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in ''
|
||||
cp bin/votour $out/bin/
|
||||
ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix}
|
||||
'' + optionalString (versionAtLeast "8.14") ''
|
||||
'' + optionalString (coqAtLeast "8.14") ''
|
||||
ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server
|
||||
'' + optionalString buildIde ''
|
||||
mkdir -p "$out/share/pixmaps"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ let Dune =
|
|||
{ "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}"
|
||||
; in
|
||||
|
||||
if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) ||
|
||||
(args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion)
|
||||
if (args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion) ||
|
||||
(args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion)
|
||||
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
}@args:
|
||||
|
||||
if args ? minimumOCamlVersion &&
|
||||
! lib.versionAtLeast ocaml.version args.minimumOCamlVersion
|
||||
lib.versionOlder ocaml.version args.minimumOCamlVersion
|
||||
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
in
|
||||
|
||||
{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch
|
||||
, libX11, xorgproto, useX11 ? safeX11 stdenv && !lib.versionAtLeast version "4.09"
|
||||
, libX11, xorgproto, useX11 ? safeX11 stdenv && lib.versionOlder version "4.09"
|
||||
, aflSupport ? false
|
||||
, flambdaSupport ? false
|
||||
, spaceTimeSupport ? false
|
||||
|
|
@ -87,14 +87,14 @@ stdenv.mkDerivation (args // {
|
|||
buildFlags = if useNativeCompilers
|
||||
then ["nixpkgs_world_bootstrap_world_opt"]
|
||||
else ["nixpkgs_world"];
|
||||
buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses
|
||||
buildInputs = optional (lib.versionOlder version "4.07") ncurses
|
||||
++ optionals useX11 [ libX11 xorgproto ];
|
||||
propagatedBuildInputs = optional spaceTimeSupport libunwind;
|
||||
installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
|
||||
preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
|
||||
preConfigure = optionalString (lib.versionOlder version "4.04") ''
|
||||
CAT=$(type -tp cat)
|
||||
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
|
||||
'' + optionalString (stdenv.isDarwin && !lib.versionAtLeast version "4.13") ''
|
||||
'' + optionalString (stdenv.isDarwin && lib.versionOlder version "4.13") ''
|
||||
# Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176
|
||||
# This is required for aarch64-darwin, everything else works as is.
|
||||
AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c"
|
||||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation (args // {
|
|||
'';
|
||||
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
broken = stdenv.isAarch64 && !lib.versionAtLeast version "4.06";
|
||||
broken = stdenv.isAarch64 && lib.versionOlder version "4.06";
|
||||
};
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ let
|
|||
export EXTENSION_DIR=$out/lib/php/extensions
|
||||
''
|
||||
# PKG_CONFIG need not be a relative path
|
||||
+ lib.optionalString (!lib.versionAtLeast version "7.4") ''
|
||||
+ lib.optionalString (lib.versionOlder version "7.4") ''
|
||||
for i in $(find . -type f -name "*.m4"); do
|
||||
substituteInPlace $i \
|
||||
--replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
|
||||
|
|
|
|||
|
|
@ -300,11 +300,6 @@ in {
|
|||
inherit passthruFun;
|
||||
};
|
||||
|
||||
graalpython37 = callPackage ./graalpython/default.nix {
|
||||
self = pythonInterpreters.graalpython37;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
rustpython = callPackage ./rustpython/default.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{ pkgs
|
||||
, lib
|
||||
, graalvm8
|
||||
, passthruFun
|
||||
, packageOverrides ? (self: super: {})
|
||||
, self
|
||||
}:
|
||||
|
||||
let
|
||||
passthru = passthruFun {
|
||||
inherit self packageOverrides;
|
||||
implementation = "graal";
|
||||
sourceVersion = graalvm8.version;
|
||||
pythonVersion = "3.7";
|
||||
libPrefix = "graalvm";
|
||||
sitePackages = "jre/languages/python/lib-python/3/site-packages";
|
||||
executable = "graalpython";
|
||||
hasDistutilsCxxPatch = false;
|
||||
pythonForBuild = pkgs.buildPackages.pythonInterpreters.graalpython37;
|
||||
};
|
||||
in lib.extendDerivation true passthru graalvm8
|
||||
|
|
@ -32,7 +32,7 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform;
|
|||
assert enableNumpy -> enablePython;
|
||||
|
||||
# Boost <1.69 can't be built on linux with clang >8, because pth was removed
|
||||
assert with lib; ((stdenv.isLinux && toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69"));
|
||||
assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69";
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
|
@ -143,7 +143,7 @@ stdenv.mkDerivation {
|
|||
stripLen = 1;
|
||||
extraPrefix = "libs/context/";
|
||||
})
|
||||
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
|
||||
++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch
|
||||
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch
|
||||
++ optional (version == "1.77.0") (fetchpatch {
|
||||
url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";
|
||||
|
|
|
|||
41
pkgs/development/libraries/jarowinkler-cpp/default.nix
Normal file
41
pkgs/development/libraries/jarowinkler-cpp/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, catch2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jarowinkler-cpp";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "jarowinkler-cpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6dIyCyoPs/2wHyGqlE+NC0pwz5ggS5edhN4Jbltx0jg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals doCheck [
|
||||
"-DRAPIDFUZZ_BUILD_TESTING=ON"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
catch2
|
||||
];
|
||||
|
||||
# uses unreleased Catch2 version 3
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Fast Jaro and Jaro-Winkler distance";
|
||||
homepage = "https://github.com/maxbachmann/jarowinkler-cpp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,31 +6,28 @@
|
|||
, curl
|
||||
, qtbase
|
||||
, qtlocation
|
||||
, mapbox-gl-native
|
||||
, maplibre-gl-native
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mapbox-gl-qml";
|
||||
version = "1.7.7.1";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "mapbox-gl-qml";
|
||||
rev = version;
|
||||
hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI=";
|
||||
hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ curl qtlocation mapbox-gl-native ];
|
||||
buildInputs = [ curl qtlocation maplibre-gl-native ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}"
|
||||
'';
|
||||
|
||||
# Package expects qt5 subdirectory of mapbox-gl-native to be in the include path
|
||||
NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial Mapbox GL Native bindings for Qt QML";
|
||||
homepage = "https://github.com/rinigus/mapbox-gl-qml";
|
||||
|
|
|
|||
66
pkgs/development/libraries/maplibre-gl-native/default.nix
Normal file
66
pkgs/development/libraries/maplibre-gl-native/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, curl
|
||||
, libuv
|
||||
, glfw3
|
||||
, rapidjson
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "maplibre-gl-native";
|
||||
version = "unstable-2022-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maplibre";
|
||||
repo = "maplibre-gl-native";
|
||||
rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "skip-license-check.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e";
|
||||
sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# don't use vendored rapidjson
|
||||
rm -r vendor/mapbox-base/extras/rapidjson
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libuv
|
||||
glfw3
|
||||
qtbase
|
||||
rapidjson
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMBGL_WITH_QT=ON"
|
||||
"-DMBGL_WITH_QT_LIB_ONLY=ON"
|
||||
"-DMBGL_WITH_QT_HEADLESS=OFF"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source alternative to Mapbox GL Native";
|
||||
homepage = "https://maplibre.org/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
platforms = platforms.linux;
|
||||
broken = lib.versionOlder qtbase.version "5.15";
|
||||
};
|
||||
}
|
||||
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/plugin*
|
||||
'';
|
||||
|
|
|
|||
41
pkgs/development/libraries/rapidfuzz-cpp/default.nix
Normal file
41
pkgs/development/libraries/rapidfuzz-cpp/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, catch2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rapidfuzz-cpp";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "rapidfuzz-cpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-331iW0nu5MlxuKNTgMkRSASnglxn+hEWBhRMnw0lY2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals doCheck [
|
||||
"-DRAPIDFUZZ_BUILD_TESTING=ON"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
catch2
|
||||
];
|
||||
|
||||
# uses unreleased Catch2 version 3
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";
|
||||
homepage = "https://github.com/maxbachmann/rapidfuzz-cpp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
50
pkgs/development/libraries/taskflow/default.nix
Normal file
50
pkgs/development/libraries/taskflow/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, doctest
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taskflow";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taskflow";
|
||||
repo = "taskflow";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UfXGupxgtowIt3BnIVWwim3rTE57TT1C9TCx9LVyN34=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./unvendor-doctest.patch;
|
||||
inherit doctest;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r 3rd-party
|
||||
|
||||
# tries to use x86 intrinsics on aarch64-darwin
|
||||
sed -i '/^#if __has_include (<immintrin\.h>)/,/^#endif/d' taskflow/utility/os.hpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "General-purpose Parallel and Heterogeneous Task Programming System";
|
||||
homepage = "https://taskflow.github.io/";
|
||||
changelog = let
|
||||
release = lib.replaceStrings ["."] ["-"] version;
|
||||
in "https://taskflow.github.io/taskflow/release-${release}.html";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
21
pkgs/development/libraries/taskflow/unvendor-doctest.patch
Normal file
21
pkgs/development/libraries/taskflow/unvendor-doctest.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
|
||||
index 3397d798..8277191e 100644
|
||||
--- a/unittests/CMakeLists.txt
|
||||
+++ b/unittests/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
enable_testing()
|
||||
|
||||
-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake)
|
||||
+include(@doctest@/lib/cmake/doctest/doctest.cmake)
|
||||
|
||||
list(APPEND TF_UNITTESTS
|
||||
utility
|
||||
@@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS
|
||||
foreach(unittest IN LISTS TF_UNITTESTS)
|
||||
add_executable(${unittest} ${unittest}.cpp)
|
||||
target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings)
|
||||
- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
|
||||
+ target_include_directories(${unittest} PRIVATE @doctest@/include/doctest)
|
||||
doctest_discover_tests(${unittest})
|
||||
endforeach()
|
||||
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
, z3
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.08"
|
||||
if lib.versionOlder ocaml.version "4.08"
|
||||
then throw "BAP is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "batteries is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, ounit
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ppxlib.version "0.18.0"
|
||||
if lib.versionOlder ppxlib.version "0.18.0"
|
||||
then throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, which, ocaml, findlib }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "bitv is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitLab, ocaml, findlib, bzip2, autoreconfHook }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "bz2 is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.10"
|
||||
if lib.versionOlder ocaml.version "4.10"
|
||||
then throw "camlpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.10"
|
||||
if lib.versionOlder ocaml.version "4.10"
|
||||
then throw "cpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildDunePackage, cstruct, lwt }:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildDunePackage, ocaml, alcotest, cstruct, sexplib }:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildDunePackage, cstruct }:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
if lib.versionOlder (cstruct.version or "1") "3"
|
||||
then cstruct
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildDunePackage, ocaml, csv, ocaml_lwt }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "csv-lwt is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "ctypes is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "erm_xml is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = !lib.versionAtLeast ocaml.version "4.06";
|
||||
doCheck = lib.versionOlder ocaml.version "4.06";
|
||||
checkTarget = "testall";
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, faraday
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.3"
|
||||
if lib.versionOlder ocaml.version "4.3"
|
||||
then throw "farfadet is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.05"
|
||||
if lib.versionOlder ocaml.version "4.05"
|
||||
then throw "fmt is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "fpath is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, extlib
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.04"
|
||||
if lib.versionOlder ocaml.version "4.04"
|
||||
then throw "javalib is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut } :
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "lablgl is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitLab, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
|| lib.versionAtLeast ocaml.version "4.13"
|
||||
then throw "lablgtk-extras is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
webpage = "https://erratique.ch/software/${pname}";
|
||||
in
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "logs is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
if lib.versionOlder ocaml.version "4.07"
|
||||
then throw "lua-ml is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, ocaml-syntax-shims
|
||||
}:
|
||||
|
||||
let inherit (lib) optional versionAtLeast; in
|
||||
let inherit (lib) optional versionOlder; in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lwt";
|
||||
|
|
@ -22,9 +22,9 @@ buildDunePackage rec {
|
|||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config cppo ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims;
|
||||
++ optional (versionOlder ocaml.version "4.08") ocaml-syntax-shims;
|
||||
buildInputs = [ dune-configurator ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
|
||||
++ optional (versionOlder ocaml.version "4.07") ncurses;
|
||||
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ let
|
|||
'';
|
||||
in
|
||||
|
||||
if !versionAtLeast ocaml.version "4.08"
|
||||
if versionOlder ocaml.version "4.08"
|
||||
then throw "nocrypto is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
with lib;
|
||||
|
||||
if !versionAtLeast ocaml.version "4.05"
|
||||
if versionOlder ocaml.version "4.05"
|
||||
then throw "notty is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, astring, pprint }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, num
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "ocsigen-deriving is not available of OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ let param = {
|
|||
}."${version}"; in
|
||||
|
||||
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
|
||||
|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version
|
||||
|| param ? min_version && lib.versionOlder ocaml.version param.min_version
|
||||
then throw "ppxlib-${version} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, react, opaline }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.04"
|
||||
if lib.versionOlder ocaml.version "4.04"
|
||||
then throw "reactiveData is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let
|
|||
version = "1.5.11";
|
||||
in
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
if lib.versionOlder ocaml.version "4.07"
|
||||
then throw "${pname} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "sedlex is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, findlib, ocaml, ocamlbuild
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "sosa is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "tsdl is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, ocaml, buildDunePackage, uri, ounit, ppx_sexp_conv, sexplib0 }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.04"
|
||||
if lib.versionOlder ocaml.version "4.04"
|
||||
then throw "uri-sexp is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
doCheck = true;
|
||||
in
|
||||
|
||||
if !(lib.versionAtLeast ocaml.version minimumOCamlVersion)
|
||||
if lib.versionOlder ocaml.version minimumOCamlVersion
|
||||
then builtins.throw "${pname} needs at least OCaml ${minimumOCamlVersion}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let
|
|||
version = "14.0.0";
|
||||
in
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "${pname} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
inherit (lib) optionals versionAtLeast;
|
||||
inherit (lib) optionals versionOlder;
|
||||
|
||||
pname = "vg";
|
||||
version = "0.9.4";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
in
|
||||
|
||||
if !versionAtLeast ocaml.version "4.03"
|
||||
if versionOlder ocaml.version "4.03"
|
||||
then throw "vg is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
|| lib.versionOlder "4.13" ocaml.version
|
||||
then throw "wasm is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let
|
|||
webpage = "https://erratique.ch/software/${pname}";
|
||||
in
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "xmlm is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, ocaml, findlib, zarith, z3 }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
if lib.versionOlder ocaml.version "4.07"
|
||||
then throw "z3 is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, gmp
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.04"
|
||||
if lib.versionOlder ocaml.version "4.04"
|
||||
then throw "zarith is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -23,17 +23,17 @@
|
|||
|
||||
let
|
||||
ansible-collections = callPackage ./collections.nix {
|
||||
version = "5.5.0";
|
||||
sha256 = "sha256-uKdtc3iJyb/Q5rDyJ23PjYNtpmcGejVXdvNQTXpm1Rg=";
|
||||
version = "5.6.0";
|
||||
sha256 = "sha256-rNMHMUNBVNo3bO7rQW7hVBzfuOo8ZIAjpVo0yz7K+fM=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
version = "2.12.3";
|
||||
version = "2.12.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ihNan3TJfKtndZKTdErTQ1D3GVI+i9m7kAjfTPlTryA=";
|
||||
sha256 = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "caldav";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-caldav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2mpE1aLipps4X/3EF0oKHXDcrgUh78/fxY6y1B1V2IU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1pYbL9k2cfjIw9AFiItlDCidxZIuOAoUcgFmSibkphA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,45 +1,37 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, blas
|
||||
, boost
|
||||
, cmake
|
||||
, doxygen
|
||||
, eigen
|
||||
, gtest
|
||||
, hdf5
|
||||
, lapack
|
||||
, mpi
|
||||
, mpi4py
|
||||
, numpy
|
||||
, pkg-config
|
||||
, ply
|
||||
, pybind11
|
||||
, pytest
|
||||
, pythonPackages
|
||||
, six
|
||||
, sympy
|
||||
, gtest
|
||||
, hdf5
|
||||
, mpi
|
||||
, ply
|
||||
, python
|
||||
, pythonPackages
|
||||
, scotch
|
||||
, setuptools
|
||||
, six
|
||||
, sphinx
|
||||
, suitesparse
|
||||
, swig
|
||||
, sympy
|
||||
, zlib
|
||||
, blas
|
||||
, lapack
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2019.1.0";
|
||||
|
||||
# TODO: test with newer pytest
|
||||
pytest = pythonPackages.callPackage
|
||||
../../../../python2-modules/pytest {
|
||||
# hypothesis tests require pytest that causes dependency cycle
|
||||
hypothesis = pythonPackages.hypothesis.override {
|
||||
doCheck = false;
|
||||
};
|
||||
};
|
||||
|
||||
dijitso = pythonPackages.buildPythonPackage {
|
||||
pname = "dijitso";
|
||||
inherit version;
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
, numba
|
||||
, opencv4
|
||||
, pandas
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, pytorch-pfn-extras
|
||||
, terminaltables
|
||||
, tqdm
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
--replace "'webdataset'," ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libjpeg ];
|
||||
propagatedBuildInputs = [ opencv4 numba pandas pytorch-pfn-extras terminaltables tqdm ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glcontext";
|
||||
version = "2.3.5";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moderngl";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wvoIfwd0UBooqbJGshADjf96Xqx2k9G1nN3Dy6v3GIY=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-fE1fyoKQz1jmTBcAz2CbkLjRfgN5QedpMOLMU8keIZs=";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, flit-core
|
||||
, async-timeout
|
||||
, dbus
|
||||
, pytest
|
||||
|
|
@ -13,15 +14,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jeepney";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f";
|
||||
sha256 = "5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
async-timeout
|
||||
dbus
|
||||
|
|
|
|||
|
|
@ -25,7 +25,11 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov jupyterlab_server --cov-report term-missing --cov-report term:skip-covered" ""
|
||||
|
||||
# translation tests try to install additional packages into read only paths
|
||||
rm -r tests/translations/
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ];
|
||||
|
|
@ -37,8 +41,6 @@ buildPythonPackage rec {
|
|||
ruamel-yaml
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "--pyargs" "jupyterlab_server" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,19 +3,20 @@
|
|||
, buildPythonPackage
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pkgs
|
||||
, procps
|
||||
, tmux
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libtmux";
|
||||
version = "0.10.3";
|
||||
version = "0.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmux-python";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256:0syj8m4x2mcq96b76b7h75dsmcai22m15pfgkk90rpg7rp6sn772";
|
||||
hash = "sha256-QbKqS40la6UGZENyGEw5kXigzexp3q7ff43fKlQ9GqE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -23,8 +24,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pkgs.procps
|
||||
pkgs.tmux
|
||||
procps
|
||||
tmux
|
||||
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,11 @@ buildPythonPackage rec {
|
|||
export MAX_JOBS=$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Unexpected output fields from running code: {'stderr'}
|
||||
"onnx/examples/np_array_tensorproto.ipynb"
|
||||
];
|
||||
|
||||
# The executables are just utility scripts that aren't too important
|
||||
postInstall = ''
|
||||
rm -r $out/bin
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pikepdf";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
extraPostFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-LgF46DGVWNuUN2KGdfOGSokf4reDx55ay3gP2LO+4dY=";
|
||||
hash = "sha256-VR2/+XCQb62FdkGZBxP2XTqatdFYZO1ngb8gvoJEvzs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -81,10 +81,6 @@ buildPythonPackage rec {
|
|||
setuptools
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_image_palette" # https://github.com/pikepdf/pikepdf/issues/328
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pikepdf" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
, lib
|
||||
, numpy
|
||||
, onnx
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torchvision
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
|
|
@ -19,9 +21,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-gB575ZKXZRAy5K5CkBtfG6KG1yQ9WDREIobsy43CEOc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy pytorch typing-extensions ];
|
||||
propagatedBuildInputs = [ numpy packaging pytorch typing-extensions ];
|
||||
|
||||
checkInputs = [ onnx pytestCheckHook ];
|
||||
checkInputs = [ onnx pytestCheckHook torchvision ];
|
||||
|
||||
# ignore all pytest warnings
|
||||
preCheck = ''
|
||||
rm pytest.ini
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pytorch_pfn_extras" ];
|
||||
|
||||
|
|
@ -29,6 +36,15 @@ buildPythonPackage rec {
|
|||
# Requires optuna which is currently (2022-02-16) marked as broken.
|
||||
"tests/pytorch_pfn_extras_tests/test_config_types.py"
|
||||
|
||||
# requires onnxruntime which was removed because of poor maintainability
|
||||
# See https://github.com/NixOS/nixpkgs/pull/105951 https://github.com/NixOS/nixpkgs/pull/155058
|
||||
"tests/pytorch_pfn_extras_tests/onnx_tests/test_export.py"
|
||||
"tests/pytorch_pfn_extras_tests/onnx_tests/test_torchvision.py"
|
||||
"tests/pytorch_pfn_extras_tests/onnx_tests/utils.py"
|
||||
|
||||
# RuntimeError: No Op registered for Gradient with domain_version of 9
|
||||
"tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py"
|
||||
|
||||
# Requires CUDA access which is not possible in the nix environment.
|
||||
"tests/pytorch_pfn_extras_tests/cuda_tests/test_allocator.py"
|
||||
"tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_batchnorm.py"
|
||||
|
|
|
|||
|
|
@ -9,13 +9,16 @@
|
|||
, jarowinkler
|
||||
, numpy
|
||||
, hypothesis
|
||||
, jarowinkler-cpp
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, rapidfuzz-cpp
|
||||
, taskflow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidfuzz";
|
||||
version = "2.0.8";
|
||||
version = "2.0.11";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -23,8 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "maxbachmann";
|
||||
repo = "RapidFuzz";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-LA4UpP3jFcVZTYKuq8aBvfGgEhyOLeCUsUXEgSnwb94=";
|
||||
hash = "sha256-npmdnUMrmbHgUgqMxKBytgtL1weWw6BjVNmBkYSKNMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,6 +38,12 @@ buildPythonPackage rec {
|
|||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
jarowinkler-cpp
|
||||
rapidfuzz-cpp
|
||||
taskflow
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jarowinkler
|
||||
numpy
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cython
|
||||
|
|
@ -7,7 +8,7 @@
|
|||
, scipy
|
||||
, scikit-learn
|
||||
, persim
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -20,8 +21,11 @@ buildPythonPackage rec {
|
|||
sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scikit-tda/ripser.py/commit/4baa248994cee9a65d710fac91809bad8ed4e5f1.patch";
|
||||
sha256 = "sha256-J/nxMOGOUiBueojJrUlAaXwktHDploYG/XL8/siF2kY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -32,13 +36,15 @@ buildPythonPackage rec {
|
|||
persim
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# specifically needed for darwin
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p $HOME/.matplotlib
|
||||
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
|
||||
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,37 +1,58 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, pkg-config, swig
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, asn1crypto
|
||||
, cffi
|
||||
, cryptography
|
||||
, ibm-sw-tpm2
|
||||
, pkg-config
|
||||
, pkgconfig
|
||||
, pycparser
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, setuptools-scm
|
||||
, tpm2-tss
|
||||
, cryptography, ibm-sw-tpm2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tpm2-pytss";
|
||||
|
||||
# Last version on github is 0.2.4, but it looks
|
||||
# like a mistake (it's missing commits from 0.1.9)
|
||||
version = "1.1.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-O0d1b99/V8b3embg8veerTrJGSVb/prlPVb7qSHErdQ=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace tpm2_pytss/config.py --replace \
|
||||
'SYSCONFDIR = CONFIG.get("sysconfdir", "/etc")' \
|
||||
'SYSCONFDIR = "${tpm2-tss}/etc"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config swig ];
|
||||
# The TCTI is dynamically loaded from tpm2-tss, we have to provide the library to the end-user
|
||||
propagatedBuildInputs = [ tpm2-tss ];
|
||||
nativeBuildInputs = [
|
||||
cffi
|
||||
pkgconfig
|
||||
# somehow propagating from pkgconfig does not work
|
||||
pkg-config
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
tpm2-tss
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
asn1crypto
|
||||
cryptography
|
||||
];
|
||||
|
||||
# https://github.com/tpm2-software/tpm2-pytss/issues/341
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
cryptography
|
||||
# provide tpm_server used as simulator for the tests
|
||||
ibm-sw-tpm2
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tpm2_pytss" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tpm2-software/tpm2-pytss";
|
||||
description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect-mqtt";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-mqtt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XuWiWL3cszC8aM+CJcAk359VaBCZNUOu4mAfmbdpoGg=";
|
||||
sha256 = "sha256-m8T1ngTcqwrel4EW8jvXg7RH+TtYyZRvIR33kzgda7E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.38.1";
|
||||
version = "0.39.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n9MqJ+npdHYpQJ8m6V8Oop+VuQ3EOCRrfIlU5qAc/Y8=";
|
||||
sha256 = "sha256-O5Dh0RWvSXCIF0savyNG5XDhGqCTJZHQpJM4VEX+S9w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickemu";
|
||||
version = "3.14";
|
||||
version = "3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quickemu-project";
|
||||
repo = "quickemu";
|
||||
rev = version;
|
||||
sha256="sha256-7zaXazGzb36Nwk/meJ3lGD+l+fylWZYnhttDL1CXN9s=";
|
||||
sha256="sha256-ako/eh8cMWKvdrgm9VTgSH67nA2igKUlJZtBeH1bu4Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -62,10 +62,10 @@ let
|
|||
|
||||
electronLibPath = with lib; makeLibraryPath (
|
||||
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
|
||||
++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
|
||||
++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
|
||||
++ optionals (! versionOlder version "12.0.0") [ libxshmfence ]
|
||||
++ optionals (! versionOlder version "17.0.0") [ libglvnd ]
|
||||
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
|
||||
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
|
||||
++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ]
|
||||
++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
|
||||
);
|
||||
|
||||
linux = {
|
||||
|
|
@ -93,7 +93,7 @@ let
|
|||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/lib/electron" \
|
||||
$out/lib/electron/electron \
|
||||
${lib.optionalString (! lib.versionOlder version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" }
|
||||
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" }
|
||||
|
||||
wrapProgram $out/lib/electron/electron \
|
||||
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "evans";
|
||||
version = "0.10.3";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ktr0731";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4KHJodqmx03uQ+HJBWmKbIBvkLh80N4fHnYL4GLciNc=";
|
||||
sha256 = "sha256-3gl4m0zTe8y4KLMAy3I7YD4Q7gLrRf3QsJap2IGX9Tk=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-to75gON3Kl0GHgVhhrW8I6GWOg9/KrUts3rwDLAfFnM=";
|
||||
vendorSha256 = "sha256-BYOrby7tlQJ0ZjZHCeDWzsCv7jBfwX9RX1weLfEz+cU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "More expressive universal gRPC client";
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-Il1E1yOejLEdKRRMqelGeJbHRjx4qFymf7N98BEdFzg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A stricter gofmt";
|
||||
homepage = "https://github.com/mvdan/gofumpt";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildDunePackage, cppo, ocamlbuild }:
|
||||
|
||||
if !lib.versionAtLeast (lib.getVersion cppo) "1.6"
|
||||
if lib.versionOlder (lib.getVersion cppo) "1.6"
|
||||
then cppo
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ncurses }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
|| lib.versionAtLeast ocaml.version "4.12"
|
||||
then throw "dune 1 is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ buildDunePackage {
|
|||
dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";
|
||||
dune = "${dune_2}/bin/dune";
|
||||
})
|
||||
] ++ lib.optional (!lib.versionAtLeast ocaml.version "4.12")
|
||||
] ++ lib.optional (lib.versionOlder ocaml.version "4.12")
|
||||
# This fixes the test-suite on macOS
|
||||
# See https://github.com/ocaml/merlin/pull/1399
|
||||
# Fixed in 4.4 for OCaml ≥ 4.12
|
||||
|
|
|
|||
|
|
@ -95,6 +95,11 @@ in stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -r bin/Release/OmniSharp.Stdio.Driver/net6.0 $out/src
|
||||
|
||||
# Delete files to mimick hacks in https://github.com/OmniSharp/omnisharp-roslyn/blob/bdc14ca/build.cake#L594
|
||||
rm $out/src/NuGet.*.dll
|
||||
rm $out/src/System.Configuration.ConfigurationManager.dll
|
||||
|
||||
makeWrapper $out/src/OmniSharp $out/bin/omnisharp \
|
||||
--prefix DOTNET_ROOT : ${dotnet-sdk} \
|
||||
--suffix PATH : ${dotnet-sdk}/bin
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
|
||||
"rev": "352a4630c81a7a5cbd3bc67327743bd8d38f2dd2",
|
||||
"date": "2022-01-03T12:31:17+00:00",
|
||||
"path": "/nix/store/c7k10h98vzqag0rsywm0p71jaz57880x-tree-sitter-c-sharp",
|
||||
"sha256": "198n5i9bvks0mmbqgzjgrhv6hy1afnx806jnap10241iyd817jbf",
|
||||
"rev": "5b6ae1f88e741b9ed738891ad1362fb9f2041671",
|
||||
"date": "2022-03-23T15:50:46-04:00",
|
||||
"path": "/nix/store/n5kjbimssqrwz7h99gq83935432dpm5s-tree-sitter-c-sharp",
|
||||
"sha256": "1yp1lyzay7hxlgca2r5yigpdy80vli4f48k2bm3h2rpa99fczmrb",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/sogaiu/tree-sitter-clojure",
|
||||
"rev": "1b24766fe9feacb8f5006233fe5c2ebd0ba31eff",
|
||||
"date": "2022-02-19T08:24:15+09:00",
|
||||
"path": "/nix/store/1vxhbw0dxg95z8rbs1b96nrcjvhrhb52-tree-sitter-clojure",
|
||||
"sha256": "0sqi825gyjndn3v00kvk9scw6s5q0lr3ig6v49sccqc2addnr6di",
|
||||
"rev": "879f0e726295807d917d576fcf9e1e432c4c20fc",
|
||||
"date": "2022-04-11T22:46:47+09:00",
|
||||
"path": "/nix/store/19bcj8f61w958njvksnqzm5r5s8szzz2-tree-sitter-clojure",
|
||||
"sha256": "16g7s819gjgdc4wlp7rnvyv5i5dqa1yawxs8l4ggnz8n8acqza9n",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/stsewd/tree-sitter-comment",
|
||||
"rev": "6975eb268f42df2afc313f96c0693e284685dba7",
|
||||
"date": "2022-01-22T20:58:19-05:00",
|
||||
"path": "/nix/store/nl4whdipy7a4g3ds2yv3c0qr7z4pifwn-tree-sitter-comment",
|
||||
"sha256": "009krarzs9qykd8fas67gychjzcbgj8j0jm9h0963dlxs4hyay73",
|
||||
"rev": "a37ca370310ac6f89b6e0ebf2b86b2219780494e",
|
||||
"date": "2022-03-28T20:21:33-05:00",
|
||||
"path": "/nix/store/nbf4bgxb7a15mwbi6lsfn7gbq8x1s3c1-tree-sitter-comment",
|
||||
"sha256": "0y0wqzgrwwg09ipfs6i3bcxm5hbvs938g2ksnygcbgqdwgd5h8f2",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/joelspadin/tree-sitter-devicetree",
|
||||
"rev": "fa70098cd70393f84785f85cdc6a45299b59cd5b",
|
||||
"date": "2021-03-28T12:08:53-05:00",
|
||||
"path": "/nix/store/6nqsmnd75vwbvkj764vg5slkmjzkmdd9-tree-sitter-devicetree",
|
||||
"sha256": "0mr3q2l7js6csb1fp8xjysikj26l94p3mmsiik4qwnw5kg694yam",
|
||||
"rev": "877adbfa0174d25894c40fa75ad52d4515a36368",
|
||||
"date": "2022-03-23T18:25:46-05:00",
|
||||
"path": "/nix/store/q0rqqm39h4dh17nlrr10kbfcqbdfk5kl-tree-sitter-devicetree",
|
||||
"sha256": "1ds7pa4x1yd54xa2mba37vp8lbi8n4l975lps0249x8xw35r0jrl",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/elixir-lang/tree-sitter-elixir",
|
||||
"rev": "b4027d7cfc96935b50878bdf9faf80bd64ac73cf",
|
||||
"date": "2022-03-04T15:40:04+00:00",
|
||||
"path": "/nix/store/h3qh2s4q51bnq66p1v067g1fb8bd1743-tree-sitter-elixir",
|
||||
"sha256": "1pf2n1j8j5w7mrh81yzvha1gh4w3vffngikj04kzd5gkx9asf3x6",
|
||||
"rev": "ec1c4cac1b2f0290c53511a72fbab17c47815d2b",
|
||||
"date": "2022-04-18T23:16:26+02:00",
|
||||
"path": "/nix/store/2jmkl3lxq6cy0cg4wjf3hgjciw0xsm0y-tree-sitter-elixir",
|
||||
"sha256": "0xiprldyfqpx5fil1b1kbnpj57n7j15j3m8dhibhif7azbd1z1y3",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-go",
|
||||
"rev": "07d722831382a043b16547b6d9202f3da07f3cb3",
|
||||
"date": "2022-03-22T15:34:30+01:00",
|
||||
"path": "/nix/store/9ay5gjwnip3jcmi096sw5fyi1kxqg1pk-tree-sitter-go",
|
||||
"sha256": "0rc1p5jab08v1r81gzaz5xmxmbspl5i5zxba9immzax8ahzhhaxn",
|
||||
"rev": "c8fed1f0847a65a04a4b8cb7655f5f416e0742ca",
|
||||
"date": "2022-03-29T10:06:48+02:00",
|
||||
"path": "/nix/store/f9vy5q9p3rf2dcp7zdw9708j138ibi36-tree-sitter-go",
|
||||
"sha256": "0yi8h1q39hsdxp9053by9xkl53wn229fhwjrrzml7k8y95qgnsyd",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/camdencheek/tree-sitter-go-mod",
|
||||
"rev": "3cbcb572109ea0bc476a292208722c326c9e6c3a",
|
||||
"date": "2021-12-16T14:44:10-07:00",
|
||||
"path": "/nix/store/jxc3lqcxagfvlk7l62fg8z98mjrn7pgz-tree-sitter-go-mod",
|
||||
"sha256": "0csrvmpvihwmw3772j4lkj49myqqp0f7imi7c11h9x9szz3lc8x8",
|
||||
"rev": "e8f51f8e4363a3d9a427e8f63f4c1bbc5ef5d8d0",
|
||||
"date": "2022-04-05T11:00:59-06:00",
|
||||
"path": "/nix/store/4a0idwqi76n4g809inrkv88nv68dgc0i-tree-sitter-go-mod",
|
||||
"sha256": "09rkqwdwhsm41nrz73rqbajap4bc0spjcld9k9fr8xmlmqa67j2b",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/connorlay/tree-sitter-heex",
|
||||
"rev": "592e22292a367312c35e13de7fdb888f029981d6",
|
||||
"date": "2022-01-30T14:04:04-08:00",
|
||||
"path": "/nix/store/21n6sqyvkfd0q5ass9nj2wgicm9ljmgv-tree-sitter-heex",
|
||||
"sha256": "1k4nhlbbn7lqrjmkz8rr81rsrfkl9qfwm9q7qd2b18ygzr52payh",
|
||||
"rev": "57e46b4b002d5fb5c1f2706fe42380e544ecab5f",
|
||||
"date": "2022-04-17T10:39:01-07:00",
|
||||
"path": "/nix/store/afmvzkh237ikn0b9fw51crzhyk4ys1d2-tree-sitter-heex",
|
||||
"sha256": "0gfxqph5j3n3dlpnyw85lrwhgjh4zm7mdrnf0qyv0f2basayfabm",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-java",
|
||||
"rev": "881b84fe7078651af5077cc4cea4c85f9fddde3b",
|
||||
"date": "2022-03-21T10:50:51+01:00",
|
||||
"path": "/nix/store/ii1dwsg972sbllim6vrmjbcaw9fcy2b1-tree-sitter-java",
|
||||
"sha256": "0kvqqrx669fyaxm55l0p5vbswf9bfknl0brsr6llyzdz81dl0vk4",
|
||||
"rev": "e7cb801ef57f74db5c4ebe14df74de852bb451b5",
|
||||
"date": "2022-04-16T15:36:51+02:00",
|
||||
"path": "/nix/store/55br93464adchwwjwdqjai8ppykwh098-tree-sitter-java",
|
||||
"sha256": "0w27xk9j7mm9gr5aiwcv6cgfvzfnps0l9b09mwfqxhndh7j96vfn",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-json",
|
||||
"rev": "203e239408d642be83edde8988d6e7b20a19f0e8",
|
||||
"date": "2021-08-18T10:35:07-07:00",
|
||||
"path": "/nix/store/yqbmn17vs2lxqg5wa8b269fcsd5wr4bv-tree-sitter-json",
|
||||
"sha256": "08igb9ylfdsjasyn0p9j4sqpp0i2x1qcdzacbmsag02jmkyi6s7f",
|
||||
"rev": "137e1ce6a02698fc246cdb9c6b886ed1de9a1ed8",
|
||||
"date": "2022-04-21T11:20:07-07:00",
|
||||
"path": "/nix/store/5f0z08shhb8d03ab4zlaq9ss4dim6k9f-tree-sitter-json",
|
||||
"sha256": "1amiaiizd4mvmnbwqbr8lmisi9831di8r8xck9wyi5sfj3nd8hai",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-julia",
|
||||
"rev": "12ea597262125fc22fd2e91aa953ac69b19c26ca",
|
||||
"date": "2021-05-03T17:44:45-07:00",
|
||||
"path": "/nix/store/lbz23r698hn7cha09qq0dbfay7dh74gg-tree-sitter-julia",
|
||||
"sha256": "0rmd7k3rv567psxrlqv17gvckijs19xs6mxni045rpayxmk441sk",
|
||||
"rev": "1e8fe0b3988e7cf56530837fd3a870089ddc7684",
|
||||
"date": "2022-04-15T13:59:51-07:00",
|
||||
"path": "/nix/store/9li8yqbvf95jksbv6myzha9bpmwq6xsg-tree-sitter-julia",
|
||||
"sha256": "0jwwx7ipdw7lq53zn5j72w5n4schjnmfv5fb3lii1nj60fqahrp7",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/latex-lsp/tree-sitter-latex",
|
||||
"rev": "b71e4928a63a6d75bc1670004a5b5a98c850a149",
|
||||
"date": "2022-03-16T20:19:11+01:00",
|
||||
"path": "/nix/store/gzpihd6k8cqsl0facz7kfgn2dh294fxw-tree-sitter-latex",
|
||||
"sha256": "1z2ywj57fpxaym6bv5ixvc01h8szazbhzmzzw960f49mlrima3n6",
|
||||
"rev": "8c5d90e78fa58ee6acab465ffa9a53e8b7b2c69c",
|
||||
"date": "2022-04-23T15:10:18+02:00",
|
||||
"path": "/nix/store/qpc37mjsl75qnmyzbkw6azphwzfdr9n9-tree-sitter-latex",
|
||||
"sha256": "1xq5g34g9sqshhpprakc4k5lrlgg1n8vb7d7nfrx4ilrz5s0kks1",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/cbarrete/tree-sitter-ledger",
|
||||
"rev": "0cdeb0e51411a3ba5493662952c3039de08939ca",
|
||||
"date": "2021-09-06T18:36:51-04:00",
|
||||
"path": "/nix/store/8gh6lfvqczb6n6ncnmszvk3kj527m75w-tree-sitter-ledger",
|
||||
"sha256": "1z0r2aphijzq6j67gb2lx2qr3fi2qpiz2x9dwkjvppdb4ch7ga7m",
|
||||
"rev": "1050a25df55a62878102d10e524b5184b316b7ad",
|
||||
"date": "2022-04-01T08:21:18-04:00",
|
||||
"path": "/nix/store/hfhxv3k8kxpg7m31xzrf56lbaa4ips65-tree-sitter-ledger",
|
||||
"sha256": "0qivr9wjab8m1ha4zisznijpw4x3phv0q0nh8lnsx7bjbz6f7xfx",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/benwilliamgraham/tree-sitter-llvm",
|
||||
"rev": "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d",
|
||||
"date": "2021-12-27T14:02:51-05:00",
|
||||
"path": "/nix/store/hjg9z82l3iqyjw0s9lf1kkm31p5wlv3d-tree-sitter-llvm",
|
||||
"sha256": "0ymrdcajji11852c158w67mgcsycphwj9mh777q3n4jn8pp37y8j",
|
||||
"rev": "e9948edc41e9e5869af99dddb2b5ff5cc5581af6",
|
||||
"date": "2022-03-31T23:27:40-04:00",
|
||||
"path": "/nix/store/8nkhzala4wscfip1g0skh1cxvmp3gp8l-tree-sitter-llvm",
|
||||
"sha256": "0d579ylhi3hgzm5wbahs6hci1rhv7q1x6wsav9dbzv1y6np2dfrk",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/MunifTanjim/tree-sitter-lua",
|
||||
"rev": "547184a6cfcc900fcac4a2a56538fa8bcdb293e6",
|
||||
"date": "2022-01-28T20:44:16+06:00",
|
||||
"path": "/nix/store/gvq91asqk6911bci8xxx5wjbp2p3c2lk-tree-sitter-lua",
|
||||
"sha256": "04z182d591r3jlw0yx29m0hhzw4b14f8m85rz2bw959p0yghs88k",
|
||||
"rev": "2b4ffd5a5ffd0c6b4c84f0d9e003050a70db2a37",
|
||||
"date": "2022-04-08T22:29:43+06:00",
|
||||
"path": "/nix/store/gj2bbwc3105djyl3l5b0hjr1y1jg7262-tree-sitter-lua",
|
||||
"sha256": "1l383clymmzk0q9b21kcgnmpww4hsh938yd3z9djpkhagadpqpjs",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue