Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
bd2d42a4f8
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "retext";
|
||||
version = "8.0.1";
|
||||
version = "8.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "retext-project";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7zNEmFf0FZCzaNq9EMfGCje66/v5T/QvI5DTftLhi7g=";
|
||||
hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68=";
|
||||
};
|
||||
|
||||
toolbarIcons = fetchzip {
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gscreenshot";
|
||||
version = "3.4.2";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thenaterhood";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ha9PTvr6XNGhe4I0ZUwrdbsNHWhz+Ubw2gp+ctLTO64=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM=";
|
||||
};
|
||||
|
||||
# needed for wrapGAppsHook to function
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ in
|
|||
, geolocationSupport ? !privacySupport
|
||||
, googleAPISupport ? geolocationSupport
|
||||
, mlsAPISupport ? geolocationSupport
|
||||
, webrtcSupport ? !privacySupport && !stdenv.hostPlatform.isRiscV
|
||||
, webrtcSupport ? !privacySupport
|
||||
|
||||
# digital rights managemewnt
|
||||
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suricata";
|
||||
version = "7.0.3";
|
||||
version = "7.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-6gdC16mHg/GvSldmGvYGi8LYUKw+ygSzIE0ozhZeNf8=";
|
||||
hash = "sha256-ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20240319";
|
||||
version = "20240320";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-aDf7HId0A4GBiG3AJZLAtVEq54RywV/gx4Sa3c/KLg0=";
|
||||
hash = "sha256-2H+VGVPnSHdsx62hPygWc5uz5vH6DS7AfmYSlBZuB4A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
|
|||
pname = "qbittorrent"
|
||||
+ lib.optionalString (guiSupport && qtVersion == "5") "-qt5"
|
||||
+ lib.optionalString (!guiSupport) "-nox";
|
||||
version = "4.6.3";
|
||||
version = "4.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbittorrent";
|
||||
repo = "qBittorrent";
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-4RVJ7xQY9zcB8+RUr80P9xKUXGxt0ATSzYmRDfZIowU=";
|
||||
hash = "sha256-98iE+VM32eq56eB4B0KNrj8+DbmRSsyAb7eMlprSsjs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,31 +9,31 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.20.2";
|
||||
version = "0.21.0";
|
||||
|
||||
dist = {
|
||||
aarch64-darwin = rec {
|
||||
archSuffix = "Darwin-arm64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "f250bed8a20b705f913e382b545641082f278f44687409f4b897d6430df4d735";
|
||||
sha256 = "97a0517ff5d72feb30ff413f5f0ef75e4c07982651bb2f7326fe5faadb0232d9";
|
||||
};
|
||||
|
||||
x86_64-darwin = rec {
|
||||
archSuffix = "Darwin-x86_64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "bec9933254ed80827a6fd38eabe1234b538bdb783f4656a94e120bcaa5689d37";
|
||||
sha256 = "f4a3a01d0ca13bd1bddf14766f39569bc3e074c7744b54d33e9336b1b55e77c9";
|
||||
};
|
||||
|
||||
aarch64-linux = rec {
|
||||
archSuffix = "Linux-aarch64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "0b839459aa3adde059577f7d9c3ed1bb4720dbdad798e4ffe00af5d86afa556e";
|
||||
sha256 = "6d3f1fe0ef561e1513579a1bf85b04f1bebe73b4c1f03d8683551ece34fecc6a";
|
||||
};
|
||||
|
||||
x86_64-linux = rec {
|
||||
archSuffix = "Linux-x86_64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "f9af6bd42e48a803fc1aeb5214bdf511582a56701a1c058ce4e66d871db65dd8";
|
||||
sha256 = "9a75c8700a988b35986ed6f761f398fdb31d56394a8e2b6801566a86e59b346c";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open-vm-tools";
|
||||
version = "12.3.5";
|
||||
version = "12.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "open-vm-tools";
|
||||
rev = "stable-${finalAttrs.version}";
|
||||
hash = "sha256-OuESPenXVDKLckIZ3sQCtQXZXCL6xSLZOxZWVEX2XMk=";
|
||||
hash = "sha256-RcjNY02aLOU4X6znfZ37+ICB19WYp+HxHRvvpfW3Ub8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/open-vm-tools";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.18.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T2hiCRoZqdbcB36Tpy597j7Hc1yeR2MijQbuheENfuA=";
|
||||
hash = "sha256-sJaiZJeT0oUAnSg9Kv8uMp1XoumumC3LB77lelmwSgw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
@ -24,11 +24,11 @@ buildGoModule rec {
|
|||
let
|
||||
skippedTests = [
|
||||
"TestDialogs"
|
||||
"TestVoldialogs"
|
||||
];
|
||||
in
|
||||
''
|
||||
export USER=$(whoami)
|
||||
export HOME=/home/$USER
|
||||
export HOME="$(mktemp -d)"
|
||||
|
||||
# Disable flaky tests
|
||||
buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
|
||||
|
|
@ -36,7 +36,7 @@ buildGoModule rec {
|
|||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = podman-tui;
|
||||
command = "podman-tui version";
|
||||
command = "HOME=$(mktemp -d) podman-tui version";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tabbed";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.suckless.org/tabbed";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Y1MgPwqMUoa2Rr4HmqjtPaQegUmQJWYkcbyFcJHAOBI=";
|
||||
hash = "sha256-KpMWBnnoF4AGRKrG30NQsVt0CFfJXVdlXLLag0Dq0sU=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hermit";
|
||||
version = "0.38.2";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "cashapp";
|
||||
repo = "hermit";
|
||||
hash = "sha256-cBVTIpY85lrKJ1bX1mIlUW1oWEHgg8wjdUh+0FHUp80=";
|
||||
hash = "sha256-BXh9HWCFeAs/S5z1ru+31mndsvt1DVh1Q7SeGzB4Rzk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W8n7WA1gHx73jHF69apoKnDCIKlbWkj5f1wVITt7F+M=";
|
||||
vendorHash = "sha256-1QMZvxy6cCJVoIP8mG7s4V0nBAGhrHoPbiKKyYDDL2g=";
|
||||
|
||||
subPackages = [ "cmd/hermit" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "igir";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emmercm";
|
||||
repo = "igir";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z70oPKUTVKWQ/BME2ourQZWNmFYRTvSRs+2mKVfoIh8=";
|
||||
hash = "sha256-yW2lInIUfexFvIeiadM2A9qXmWOVClh1pVXS93pbH8I=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lTqAUtUv0WmS/TUkPZQyCOYhY5BFz4ZCXqJN5I6l/cI=";
|
||||
npmDepsHash = "sha256-5Xp3vRW0tZXEN0n1IqrnPXYnMM+25diSKrG1ba/ZWns=";
|
||||
|
||||
# I have no clue why I have to do this
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
{ stdenv
|
||||
, config
|
||||
, pkgs
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, eigen
|
||||
, onnxruntime
|
||||
, opencv
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, cudaPackages ? { }
|
||||
}@inputs:
|
||||
|
||||
let
|
||||
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv;
|
||||
cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities;
|
||||
# E.g. [ "80" "86" "90" ]
|
||||
cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities);
|
||||
cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures;
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastdeploy-ppocr";
|
||||
version = "0-unstable-2023-10-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cryolitia";
|
||||
repo = "FastDeploy";
|
||||
# follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4
|
||||
rev = "2e68908141f6950bc5d22ba84f514e893cc238ea";
|
||||
hash = "sha256-BWO4lKZhwNG6mbkC70hPgMNjabTnEV5XMo0bLV/gvQs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "cmake" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
eigen
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
onnxruntime
|
||||
opencv
|
||||
] ++ lib.optionals cudaSupport (with cudaPackages; [
|
||||
cuda_cccl # cub/cub.cuh
|
||||
libcublas # cublas_v2.h
|
||||
libcurand # curand.h
|
||||
libcusparse # cusparse.h
|
||||
libcufft # cufft.h
|
||||
cudnn # cudnn.h
|
||||
cuda_cudart
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
|
||||
] ++ lib.optionals cudaSupport [
|
||||
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $cmake
|
||||
install -Dm644 ${finalAttrs.src}/cmake/Findonnxruntime.cmake $cmake/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "MaaAssistantArknights stripped-down version of FastDeploy";
|
||||
homepage = "https://github.com/MaaAssistantArknights/FastDeploy";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.apsl20;
|
||||
broken = cudaSupport && stdenv.hostPlatform.system != "x86_64-linux";
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
{ lib
|
||||
, config
|
||||
, callPackage
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, asio
|
||||
, cmake
|
||||
, eigen
|
||||
, libcpr
|
||||
, onnxruntime
|
||||
, opencv
|
||||
, isBeta ? false
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, cudaPackages ? { }
|
||||
}:
|
||||
|
||||
let
|
||||
fastdeploy = callPackage ./fastdeploy-ppocr.nix { };
|
||||
sources = lib.importJSON ./pin.json;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttr: {
|
||||
pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta";
|
||||
version = if isBeta then sources.beta.version else sources.stable.version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaaAssistantArknights";
|
||||
repo = "MaaAssistantArknights";
|
||||
rev = "v${finalAttr.version}";
|
||||
hash = if isBeta then sources.beta.hash else sources.stable.hash;
|
||||
};
|
||||
|
||||
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=maa-assistant-arknights
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'RUNTIME DESTINATION .' ' ' \
|
||||
--replace-fail 'LIBRARY DESTINATION .' ' ' \
|
||||
--replace-fail 'PUBLIC_HEADER DESTINATION .' ' '
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'find_package(asio ' '# find_package(asio ' \
|
||||
--replace-fail 'asio::asio' ' '
|
||||
|
||||
shopt -s globstar nullglob
|
||||
|
||||
substituteInPlace src/MaaCore/**/{*.h,*.cpp,*.hpp,*.cc} \
|
||||
--replace 'onnxruntime/core/session/' ""
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'ONNXRuntime' 'onnxruntime'
|
||||
|
||||
cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
asio
|
||||
cmake
|
||||
fastdeploy.cmake
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fastdeploy
|
||||
libcpr
|
||||
onnxruntime
|
||||
opencv
|
||||
] ++ lib.optionals cudaSupport (with cudaPackages; [
|
||||
cuda_cccl # cub/cub.cuh
|
||||
libcublas # cublas_v2.h
|
||||
libcurand # curand.h
|
||||
libcusparse # cusparse.h
|
||||
libcufft # cufft.h
|
||||
cudnn # cudnn.h
|
||||
cuda_cudart
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
|
||||
(lib.cmakeBool "USE_MAADEPS" false)
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
|
||||
(lib.cmakeBool "INSTALL_RESOURCE" true)
|
||||
(lib.cmakeBool "INSTALL_PYTHON" true)
|
||||
(lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}")
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/${finalAttr.pname}
|
||||
mv $out/{Python,resource} $out/share/${finalAttr.pname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Arknights assistant";
|
||||
homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ Cryolitia ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "5.2.0",
|
||||
"hash": "sha256-vxGJHm1StQNN+0IVlGMqKVKW56LH6KUC94utDn7FcNo="
|
||||
},
|
||||
"beta": {
|
||||
"version": "5.2.0",
|
||||
"hash": "sha256-vxGJHm1StQNN+0IVlGMqKVKW56LH6KUC94utDn7FcNo="
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
#!/usr/bin/env -S nix shell nixpkgs#nix nixpkgs#curl nixpkgs#jq nixpkgs#nix-prefetch-github --command bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
directory="$(dirname $0 | xargs realpath)"
|
||||
|
||||
version_stable="$(curl "https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/releases/latest" | jq -r '.tag_name')"
|
||||
|
||||
hash_stable=$(nix-prefetch-github MaaAssistantArknights MaaAssistantArknights --rev ${version_stable} -v | jq -r .hash)
|
||||
|
||||
version_beta="$(curl "https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/releases?per_page=1" | jq -r '.[0].tag_name')"
|
||||
|
||||
hash_beta=$(nix-prefetch-github MaaAssistantArknights MaaAssistantArknights --rev ${version_beta} -v | jq -r .hash)
|
||||
|
||||
cat > $directory/pin.json << EOF
|
||||
{
|
||||
"stable": {
|
||||
"version": "${version_stable#*v}",
|
||||
"hash": "$hash_stable"
|
||||
},
|
||||
"beta": {
|
||||
"version": "${version_beta#*v}",
|
||||
"hash": "$hash_beta"
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
cat $directory/pin.json
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, openssl
|
||||
, maa-assistant-arknights
|
||||
, android-tools
|
||||
, git
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "maa-cli";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaaAssistantArknights";
|
||||
repo = "maa-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pAtv6gCLFKRwUQEF6kD2bCPGpQGzahsfq/tAnQjrZrw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/pull/126
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "git2" "core_installer" ];
|
||||
|
||||
cargoHash = "sha256-KjI/5vl7oKVtXYehGLgi9jcaO4Y/TceL498rCPGHMD0=";
|
||||
|
||||
# maa-cli would only seach libMaaCore.so and resources in itself's path
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/maa-assistant-arknights/
|
||||
ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/
|
||||
ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/
|
||||
mv $out/bin/maa $out/share/maa-assistant-arknights/
|
||||
|
||||
makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \
|
||||
--prefix PATH : "${lib.makeBinPath [
|
||||
android-tools git
|
||||
]}"
|
||||
|
||||
installShellCompletion --cmd maa \
|
||||
--bash <($out/bin/maa complete bash) \
|
||||
--fish <($out/bin/maa complete fish) \
|
||||
--zsh <($out/bin/maa complete zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple CLI for MAA by Rust";
|
||||
homepage = "https://github.com/MaaAssistantArknights/maa-cli";
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ Cryolitia ];
|
||||
mainProgram = "maa";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "mystmd";
|
||||
version = "1.1.47";
|
||||
version = "1.1.48";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "mystmd";
|
||||
rev = "mystmd@${version}";
|
||||
hash = "sha256-gF3IGkdMM4pbtHOVnhk35nxPBLqUSc/IzrXvg+duQa4=";
|
||||
hash = "sha256-Uw/00EzgnrQYunABx7O35V+YwFnDDW+EI5NqMEUV8zk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-63QS+vnIwkdMES2UrWvHeytWp5NuEf5uKpHA0m1XTHU=";
|
||||
npmDepsHash = "sha256-JSVdHhzOgzIwB61ST6vYVENtohjU6Q3lrp+hVPye02g=";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,65 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, cargo
|
||||
, capnproto
|
||||
, blueprint-compiler
|
||||
, wrapGAppsHook4
|
||||
, desktop-file-utils
|
||||
, libadwaita
|
||||
, gtksourceview5
|
||||
, openssl
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notify-client";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranfdev";
|
||||
repo = "notify";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0p/XIGaawreGHbMRoHNmUEIxgwEgigtrubeJpndHsug=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-uZRAGnydPGwyzAyHIyY+UlT42m+GyEasM0cSa8Bp9Hs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
cargo
|
||||
capnproto
|
||||
blueprint-compiler
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
gtksourceview5
|
||||
openssl
|
||||
sqlite
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ntfy client application to receive everyday's notifications";
|
||||
homepage = "https://github.com/ranfdev/Notify";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "notify";
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "pmtiles";
|
||||
version = "1.17.0";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protomaps";
|
||||
repo = "go-pmtiles";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BHzQMSIE94LW6SGcpaMdX/ztzVLlmWquwWMbruLAt00=";
|
||||
hash = "sha256-JVx543uatVUWD1TmnjJBz4X/oHPKpbrGpGcxQd2IYiw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tSQjCdgEXIGlSWcIB6lLQulAiEAebgW3pXL9Z2ujgIs=";
|
||||
vendorHash = "sha256-N/8n3NDHShcXjPvLSkLRacY4aqFzLYM/+/mJRGXQAVg=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "5.5.0";
|
||||
version = "5.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3Wqej2Zb/RxxOOhWscZiyafGftl3ShozqVkUF7V0fP4=";
|
||||
hash = "sha256-r/ff/Z/nsmQEWCVvmS0hGKXRuzIoDGhzfIRAxC6EaZk=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildGo121Module
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
}:
|
||||
let
|
||||
version = "0.10.0";
|
||||
|
|
@ -18,7 +19,7 @@ let
|
|||
'';
|
||||
in
|
||||
|
||||
buildGo121Module {
|
||||
buildGoModule {
|
||||
pname = "scion";
|
||||
|
||||
inherit version;
|
||||
|
|
@ -43,6 +44,13 @@ buildGo121Module {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/scionproto/scion/commit/cb7fa6d6aab55c9eb90556c2b996b87539f8aa02.patch";
|
||||
hash = "sha256-mMGJMPB6T7KeDXjEXffdrhzyKwaFmhuisK6PjHOJIdU=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A future Internet architecture utilizing path-aware networking";
|
||||
homepage = "https://scion-architecture.net/";
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "universal-android-debloater";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Universal-Debloater-Alliance";
|
||||
repo = "universal-android-debloater-next-generation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v2svWAurYoUZzOHypM+Pk0FCnfSi1NH80jIafYxwLPQ=";
|
||||
hash = "sha256-yiCl6inPFveMO4IA2NwwpEmbRSmrZBeZR+eiKzGj6a0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gO1tvY565T+361JNVkFH4pC1ky2oxJqp/OCbS9sNeMI=";
|
||||
cargoHash = "sha256-HqyOslcr3pwDvpZ8CNbAy2W5jGhWGWoe/rutq0leNaY=";
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
|
|
|
|||
|
|
@ -42,6 +42,9 @@ in
|
|||
postFixup = lib.optionalString useSteamRun (let
|
||||
steam-run = (steam.override {
|
||||
extraPkgs = pkgs: [ pkgs.libunwind ];
|
||||
extraProfile = ''
|
||||
unset TZ
|
||||
'';
|
||||
}).run;
|
||||
in ''
|
||||
substituteInPlace $out/bin/XIVLauncher.Core \
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
{ cage
|
||||
, fetchFromGitLab
|
||||
, gnome
|
||||
{ fetchFromGitLab
|
||||
, lib
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -8,25 +6,28 @@
|
|||
, weston
|
||||
, xorg
|
||||
, xwayland
|
||||
, withMutter ? false
|
||||
, withCage ? false
|
||||
, withCage ? false , cage
|
||||
, withKwin ? false , kdePackages
|
||||
, withMutter ? false, gnome
|
||||
, withDbus ? withMutter , dbus # Since 0.0.3, mutter compositors run with their own DBUS sessions
|
||||
}:
|
||||
let
|
||||
compositors = [ weston ]
|
||||
++ lib.optional withMutter gnome.mutter
|
||||
++ lib.optional withCage cage
|
||||
++ lib.optional withKwin kdePackages.kwin
|
||||
++ lib.optional withMutter gnome.mutter ++ lib.optional withDbus dbus
|
||||
;
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "xwayland-run";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "ofourdan";
|
||||
repo = "xwayland-run";
|
||||
rev = version;
|
||||
hash = "sha256-+HdRLIizEdtKWD8HadQQf750e2t1AWa14U/Xwu3xPK4=";
|
||||
hash = "sha256-yYULbbcFDT1zRFn1UWS0dyuchGYnOZypDmxqc14RYF4=";
|
||||
};
|
||||
|
||||
pyproject = false;
|
||||
|
|
@ -38,7 +39,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
ninja
|
||||
];
|
||||
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/wlheadless-run \
|
||||
--prefix PATH : ${lib.makeBinPath compositors}
|
||||
|
|
|
|||
|
|
@ -47,10 +47,10 @@ in {
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "9";
|
||||
patch = "18";
|
||||
patch = "19";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-AVl9sBMsHPezMe/2iuCbWiNaPDyqnJRMKcrH0cTEwAo=";
|
||||
hash = "sha256-1Iks0WGPZFjLhRIIwDDfFIJ3lgnQ85OZkb04GE+MZ54=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
@ -60,10 +60,10 @@ in {
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "10";
|
||||
patch = "13";
|
||||
patch = "14";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-XIiEhmhkDT4VKzW0U27xwjsspL0slX7x7LsFP1cd0/Y=";
|
||||
hash = "sha256-nFBIH6qMKDIym6D8iGjQpgamgPxPYOxI0mzo4HZ1H9o=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "juce";
|
||||
version = "7.0.9";
|
||||
version = "7.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juce-framework";
|
||||
repo = "juce";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-k8cNTPH9OgOav4dsSLqrd5PlJ1rqO0PLt6Lwmumc2Gg=";
|
||||
hash = "sha256-CAHhHPTUvIyDOh2CdvNmw26HfoWWtbqRRiR+3Ky4GYA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
let
|
||||
pname = "comm";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage {
|
|||
owner = "ipython";
|
||||
repo = "comm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iyO3q9E2lYU1rMYTnsa+ZJYh+Hq72LEvE9ynebFIBUk=";
|
||||
hash = "sha256-51HSSULhbKb1NdLJ//b3Vh6sOLWp0B4KW469htpduqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,29 +6,35 @@
|
|||
, pytestCheckHook
|
||||
, tomli
|
||||
, twine
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatch-jupyter-builder";
|
||||
version = "0.8.3";
|
||||
format = "pyproject";
|
||||
version = "0.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyterlab";
|
||||
repo = "hatch-jupyter-builder";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UywhFJ8d1+lSFOF5ECsknDeQuO7ppckdy5IqAT14ius=";
|
||||
hash = "sha256-QDWHVdjtexUNGRL+dVehdBwahSW2HmNkZKkQyuOghyI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
tomli
|
||||
twine
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "huggingface-hub";
|
||||
version = "0.21.4";
|
||||
version = "0.22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = "huggingface_hub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SN0FDOuXvgDqxpK4RRRXQDTPG5/BV3DJsiEq2q5WvsY=";
|
||||
hash = "sha256-jq7oCQlLXwr859mhHYolKp/N63Z0SIksMTwNL0JjfNQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipyvuetify";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
pyproject = true;
|
||||
|
||||
# GitHub version tries to run npm (Node JS)
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MAqO6wREtnaVCgG88UXYsKlLpkizbtPqmeQ9u3UVnU0=";
|
||||
hash = "sha256-kAcL/PR3jThbmfDKMBQRPbcDyZ7GrRwuzDLWE8bC1M4=";
|
||||
};
|
||||
|
||||
# drop pynpm which tries to install node_modules
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jenkins-job-builder";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-queP6RBpw32PXbpz6StIE6Pb7RNsm2O4tNarrDwb2cU=";
|
||||
hash = "sha256-9IXhzdXVEk0M2O01eHysiDziZWmEy6Ehb7nHC6OHCwc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-client";
|
||||
version = "8.6.0";
|
||||
version = "8.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyter_client";
|
||||
inherit version;
|
||||
hash = "sha256-BkIkS7g7R2SuYNB+AQ4V8OLSdexOkYqPe4D7vvPKYMc=";
|
||||
hash = "sha256-6EJRXiurjhkYbYn9/qer0V453VgflOOZ8A4q9aFlLT8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-collaboration";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -27,21 +27,21 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "jupyter_collaboration";
|
||||
inherit version;
|
||||
hash = "sha256-3N3w6JJ0SHa1EYBED/aU1g0IX9nDHf4iseGPwEK1zpw=";
|
||||
hash = "sha256-aQYZGiya7E3blwVkWx6w2Hb2M0v/z9dOMU72EGW4aCg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^timeout/d" pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatch-jupyter-builder
|
||||
hatch-nodejs-version
|
||||
hatchling
|
||||
jupyterlab
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
jsonschema
|
||||
jupyter-events
|
||||
jupyter-server
|
||||
|
|
@ -60,14 +60,15 @@ buildPythonPackage rec {
|
|||
"jupyter_collaboration"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TEMP
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
|
||||
"test_dirty"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-core";
|
||||
version = "5.7.1";
|
||||
version = "5.7.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
pyproject = true;
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "jupyter";
|
||||
repo = "jupyter_core";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Uh7slD8mQg2R++wltXrYiPSJnmM5w9tej8GN/0GMBmA=";
|
||||
hash = "sha256-qu25ryZreRPHoubFJTFusGdkTPHbl/yl94g+XU5A5Mc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-events";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
owner = "jupyter";
|
||||
repo = "jupyter_events";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LDj6dTtq3npJxLKBQEEwGQFeDPvWF2adHeJhOai2MRU=";
|
||||
hash = "sha256-8aps8aNgXw+XbDgtCvWw+Ij1Cm1N0G+wcL35ySkofOk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
let self = buildPythonPackage rec {
|
||||
pname = "jupyter-server-terminals";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-server";
|
||||
repo = "jupyter_server_terminals";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-e4PtrK2DCJAK+LYmGguwU5hmxdqP5Dws1dPoPOv/WrM=";
|
||||
hash = "sha256-af7jBscGkbekXgfDxwAfrJSY1uEuIGfzzSsjaPdlYcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -72,14 +72,14 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterhub";
|
||||
version = "4.0.2";
|
||||
version = "4.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1ORQ7tjZDfvPDsoI8A8gk6C8503FH3z8C3BX9gI0Gh0=";
|
||||
hash = "sha256-sKpNnbmpg5gWgLyoZ+15FSV4/oPJqDJ3TuE5Bbe3V0w=";
|
||||
};
|
||||
|
||||
# Most of this only applies when building from source (e.g. js/css assets are
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "4.1.4";
|
||||
version = "4.1.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4DyCwSStigiS5Ji53eecUIaLLCZ4Gayj9VzkfFfr6x0=";
|
||||
hash = "sha256-ya11KQyxC/r/NiS/P7uFIxm0zOTEVmE/jruqmNA1JNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "9.5.14";
|
||||
version = "9.5.15";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
owner = "squidfunk";
|
||||
repo = "mkdocs-material";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VqfjqsTEi5C33MSb83ku37i0hgDyujrdaZbeqpMOvko=";
|
||||
hash = "sha256-u5XRLAh1X/Y6p6HcKMeCEeDe98tCieGdF9oxqh69ris=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
let nbclient = buildPythonPackage rec {
|
||||
pname = "nbclient";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -28,7 +28,7 @@ let nbclient = buildPythonPackage rec {
|
|||
owner = "jupyter";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-m0Tke/JlTeKE3PJZ1rBejra/HPEXCSS0ur/cPiSBJZw=";
|
||||
hash = "sha256-8OLkpwX4Gpam9VSFUtNS41Ypxe4+2yN3ng6iVY9DSqY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbformat";
|
||||
version = "5.9.2";
|
||||
version = "5.10.3";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-X5i1uhmX3/F1534MF9XBCpbq7Sy9HeNTPR/DXV4REZI=";
|
||||
hash = "sha256-YO1ekQ73xiZLh9ZE8naxtJ4kARkw3u9UYFGI3eshFoU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "notebook";
|
||||
version = "7.1.1";
|
||||
version = "7.1.2";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gY50IPoh9ALnJq+58C3388EPKUwC44PtGYUoZsMWEIs=";
|
||||
hash = "sha256-78LIAEOQng+qF/zp6bN8BZwDrw7Jmk1NuEyyHZ0uk2o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -36,12 +36,10 @@ buildPythonPackage rec {
|
|||
|
||||
dependencies = [
|
||||
jupyterhub
|
||||
pyjwt
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
azuread = [
|
||||
pyjwt
|
||||
];
|
||||
googlegroups = [
|
||||
google-api-python-client
|
||||
google-auth-oauthlib
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "optimum";
|
||||
version = "1.17.1";
|
||||
version = "1.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = "optimum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-21y7pFRCZqwNaZR+TcXH2KIK5IZuLVq0wgIQqByyEf8=";
|
||||
hash = "sha256-svNavPO/3ARqcBDpvaAdbbSqFpzgUY72vy2J1d4Bt90=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ buildPythonPackage rec {
|
|||
"test_downloader_getter"
|
||||
"test_general"
|
||||
"test_get_config_dirs"
|
||||
"test_get_configuration"
|
||||
"test_get_data"
|
||||
"test_valid_dblp_key"
|
||||
"test_validate_arxivid"
|
||||
|
|
|
|||
|
|
@ -4,12 +4,11 @@
|
|||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, importlib-metadata
|
||||
, packaging
|
||||
, pip
|
||||
, platformdirs
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tomli
|
||||
, userpath
|
||||
, git
|
||||
}:
|
||||
|
|
@ -17,29 +16,29 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "pipx";
|
||||
version = "1.4.3";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pipxproject";
|
||||
repo = pname;
|
||||
owner = "pypa";
|
||||
repo = "pipx";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NxXOeVXwBhGqi4DUABV8UV+cDER0ROBFdgiyYTzdvuo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
argcomplete
|
||||
packaging
|
||||
platformdirs
|
||||
userpath
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -77,12 +76,13 @@ buildPythonPackage rec {
|
|||
"determination"
|
||||
"json"
|
||||
"test_list_short"
|
||||
"test_skip_maintenance"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Install and run Python applications in isolated environments";
|
||||
mainProgram = "pipx";
|
||||
homepage = "https://github.com/pipxproject/pipx";
|
||||
homepage = "https://github.com/pypa/pipx";
|
||||
changelog = "https://github.com/pypa/pipx/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yshym ];
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
let self = buildPythonPackage rec {
|
||||
pname = "pytest-jupyter";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-server";
|
||||
repo = "pytest-jupyter";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8pQNtzMylW9b3vk0kp7NcJnXAJKYeoFsHy/lyQFCNzc=";
|
||||
hash = "sha256-+NtLyTpMpJ+asbiQZNLFs1qLr00UlEOlbxortQ1B4so=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,28 +2,24 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose2
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "setuptools_dso";
|
||||
pname = "setuptools-dso";
|
||||
version = "2.10";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "setuptools_dso";
|
||||
inherit version;
|
||||
hash = "sha256-sjAZ9enOw3vF3zqXNbhu45SM5/sv2kIwfKC6SWJdG0Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ nose2 ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
nose2 -v
|
||||
runHook postCheck
|
||||
'';
|
||||
nativeCheckInputs = [ nose2 pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "setuptools extension for building non-Python Dynamic Shared Objects";
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
, pythonRelaxDepsHook
|
||||
, pillow
|
||||
, sortedcollections
|
||||
, setuptools_dso
|
||||
, setuptools-dso
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
ordered-set
|
||||
pillow
|
||||
sortedcollections
|
||||
setuptools_dso
|
||||
setuptools-dso
|
||||
];
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
|
|
|
|||
|
|
@ -28,9 +28,18 @@
|
|||
|
||||
assert name == null -> pname != null;
|
||||
|
||||
with import ./functions.nix { inherit lib gemConfig; };
|
||||
|
||||
let
|
||||
functions = import ./functions.nix { inherit lib gemConfig; };
|
||||
|
||||
inherit (functions)
|
||||
applyGemConfigs
|
||||
bundlerFiles
|
||||
composeGemAttrs
|
||||
filterGemset
|
||||
genStubsScript
|
||||
pathDerivation
|
||||
;
|
||||
|
||||
gemFiles = bundlerFiles args;
|
||||
|
||||
importedGemset = if builtins.typeOf gemFiles.gemset != "set"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
pname = "visualvm";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
|
||||
sha256 = "sha256-k9DnbLfpCQimRueHquDSuBDhn/w8ZyUKZzZ5o35YCNA=";
|
||||
sha256 = "sha256-yWSB8mqcOG7xd4/8YjPXzGvl7BgyOLdIoyAs69+/kv4=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k6";
|
||||
version = "0.49.0";
|
||||
version = "0.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zlsHEAGsey+qe0s7sle9Kt/V0hTp6uzelJmRlATznUY=";
|
||||
hash = "sha256-lR16M8TAP0ilvcrA9YjVoZMrsi+kwEFKx5Fd3birHHM=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fzf-make";
|
||||
version = "0.25.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyu08";
|
||||
repo = "fzf-make";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jElKCOCTG33ysePz4SfrbN9xWdTB83G+/9DUqNKI6x8=";
|
||||
hash = "sha256-rmQR1XnNJQnTz9vS+UWPpfFakgkVwNZasjRlNwk4p68=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kXp/2F32aJFQ5z0TeggZWv1S2rDpnTPEYyHNZCtEjtg=";
|
||||
cargoHash = "sha256-QXyibZHqhK6Jhh6Qu73o2o6hABpNWPIxS4tR5IXLNkc=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irqbalance";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irqbalance";
|
||||
repo = "irqbalance";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0e7dV6gncSlAUfkyX7F0FSYJjlvdi/ol7YC2T5afl+Q=";
|
||||
sha256 = "sha256-7es7wwsPnDSF37uL5SCgAQB+u+qGWmWDHOh3JkHuXMs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ self: super: {
|
|||
|
||||
pg_ivm = super.callPackage ./pg_ivm.nix { };
|
||||
|
||||
pg_libversion = super.callPackage ./pg_libversion.nix { };
|
||||
|
||||
pg_rational = super.callPackage ./pg_rational.nix { };
|
||||
|
||||
pg_repack = super.callPackage ./pg_repack.nix { };
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, postgresql
|
||||
, libversion
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pg_libversion";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "repology";
|
||||
repo = "postgresql-libversion";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-60HX/Y+6QIzqmDnjNpgO4GCbDhNfeek9myMWoYLdrAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
postgresql
|
||||
libversion
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -t $out/lib libversion${postgresql.dlSuffix}
|
||||
install -D -t $out/share/postgresql/extension *.sql
|
||||
install -D -t $out/share/postgresql/extension *.control
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PostgreSQL extension with support for version string comparison";
|
||||
homepage = "https://github.com/repology/postgresql-libversion";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jopejoe1 ];
|
||||
platforms = postgresql.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
||||
|
|
@ -106,7 +106,6 @@ let
|
|||
++ lib.optionals zstdEnabled [ "--with-zstd" ]
|
||||
++ lib.optionals gssSupport [ "--with-gssapi" ]
|
||||
++ lib.optionals pythonSupport [ "--with-python" ]
|
||||
++ lib.optionals stdenv'.hostPlatform.isRiscV [ "--disable-spinlocks" ]
|
||||
++ lib.optionals jitSupport [ "--with-llvm" ]
|
||||
++ lib.optionals stdenv'.isLinux [ "--with-pam" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tempo";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ory7UllnV6Qzjvk2dy5B9pell0Ezse2NAn2rQ1gDsGM=";
|
||||
hash = "sha256-OTgk4mejMSdnUV4VLiRMWPBzHrRo+wKMoCsD4O+XxLA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
, icu
|
||||
, fetchYarnDeps
|
||||
, yarn
|
||||
, fixup_yarn_lock
|
||||
, prefetch-yarn-deps
|
||||
, nodePackages
|
||||
, nodejs_18
|
||||
, jq
|
||||
|
|
@ -215,6 +215,7 @@ let
|
|||
nodejs_18
|
||||
jq
|
||||
moreutils
|
||||
prefetch-yarn-deps
|
||||
];
|
||||
|
||||
outputs = [ "out" "javascripts" ];
|
||||
|
|
@ -252,7 +253,7 @@ let
|
|||
yarn config --offline set yarn-offline-mirror $yarnOfflineCache
|
||||
|
||||
# Fixup "resolved"-entries in yarn.lock to match our offline cache
|
||||
${fixup_yarn_lock}/bin/fixup_yarn_lock app/assets/javascripts/yarn.lock
|
||||
fixup-yarn-lock app/assets/javascripts/yarn.lock
|
||||
|
||||
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strongswan";
|
||||
version = "5.9.13"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
|
||||
version = "5.9.14"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strongswan";
|
||||
repo = "strongswan";
|
||||
rev = version;
|
||||
hash = "sha256-uI7Ibdx6I+gd83KJ24ERmpJSMNIbsk10PszdLxpcXcQ=";
|
||||
hash = "sha256-qFM7ErfqiDlUsZdGXJQVW3nJoh+I6tEdKRwzrKteRVY=";
|
||||
};
|
||||
|
||||
dontPatchELF = true;
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry-plugin-export";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fmgX1/dVH0e3d7FYhOdOnLtjp0mkkaSZm1YW4gxZr74=";
|
||||
hash = "sha256-HXzlfiZYDkrQRFXF1up52KrwGhrIctd3CtjQTNz8xH4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "saml2aws";
|
||||
version = "2.36.13";
|
||||
version = "2.36.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Versent";
|
||||
repo = "saml2aws";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cLH1GcMgTPnPJVpHOQkW71hf0MKusL8NRc1YQsNSW2I=";
|
||||
sha256 = "sha256-0XI1G6ULsSuNPCqsX+A0yvUSkyxL8jvYSplmAKj9GNs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-E3WYExtV4VsrBZ0uEQZ36CUCK+qf8LTPlNwcdO0eEzA=";
|
||||
vendorHash = "sha256-SHi2yr/CR1n0/PnGifOlJkFD8ca0TTOTqMCo581a7hc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
|
|
|
|||
|
|
@ -40806,8 +40806,6 @@ with pkgs;
|
|||
|
||||
xboxdrv = callPackage ../misc/drivers/xboxdrv { };
|
||||
|
||||
xivlauncher = callPackage ../games/xivlauncher { };
|
||||
|
||||
xortool = python3Packages.callPackage ../tools/security/xortool { };
|
||||
|
||||
xorex = callPackage ../tools/security/xorex { };
|
||||
|
|
|
|||
|
|
@ -463,6 +463,7 @@ mapAliases ({
|
|||
scikitlearn = scikit-learn; # added 2021-07-21
|
||||
selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
|
||||
sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24
|
||||
setuptools_dso = setuptools-dso; # added 2024-03-03
|
||||
setuptools_scm = setuptools-scm; # added 2021-06-03
|
||||
setuptoolsTrial = setuptools-trial; # added 2023-11-11
|
||||
sharkiqpy = sharkiq; # added 2022-05-21
|
||||
|
|
|
|||
|
|
@ -13511,7 +13511,7 @@ self: super: with self; {
|
|||
|
||||
setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { };
|
||||
|
||||
setuptools_dso = callPackage ../development/python-modules/setuptools_dso { };
|
||||
setuptools-dso = callPackage ../development/python-modules/setuptools-dso { };
|
||||
|
||||
setuptools-generate = callPackage ../development/python-modules/setuptools-generate { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue