Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ebaef3ce4c
@ -7109,6 +7109,12 @@
|
||||
github = "j4m3s-s";
|
||||
githubId = 9413812;
|
||||
};
|
||||
jacfal = {
|
||||
name = "Jakub Pravda";
|
||||
email = "me@jakubpravda.net";
|
||||
github = "jakub-pravda";
|
||||
githubId = 16310411;
|
||||
};
|
||||
jacg = {
|
||||
name = "Jacek Generowicz";
|
||||
email = "jacg@my-post-office.net";
|
||||
@ -12050,6 +12056,15 @@
|
||||
github = "jackyliu16";
|
||||
githubId = 50787361;
|
||||
};
|
||||
onemoresuza = {
|
||||
name = "Coutinho de Souza";
|
||||
email = "dev@onemoresuza.mailer.me";
|
||||
github = "onemoresuza";
|
||||
githubId = 106456302;
|
||||
keys = [{
|
||||
fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E";
|
||||
}];
|
||||
};
|
||||
onixie = {
|
||||
email = "onixie@gmail.com";
|
||||
github = "onixie";
|
||||
@ -12614,6 +12629,12 @@
|
||||
githubId = 421510;
|
||||
name = "Noé Rubinstein";
|
||||
};
|
||||
pho = {
|
||||
email = "phofin@gmail.com";
|
||||
github = "pho";
|
||||
githubId = 88469;
|
||||
name = "Jaime Breva";
|
||||
};
|
||||
photex = {
|
||||
email = "photex@gmail.com";
|
||||
github = "photex";
|
||||
@ -14773,6 +14794,12 @@
|
||||
githubId = 16090;
|
||||
name = "Yann Hodique";
|
||||
};
|
||||
sigmanificient = {
|
||||
email = "sigmanificient@gmail.com";
|
||||
github = "Sigmanificient";
|
||||
githubId = 53050011;
|
||||
name = "Yohann Boniface";
|
||||
};
|
||||
sikmir = {
|
||||
email = "sikmir@disroot.org";
|
||||
github = "sikmir";
|
||||
|
||||
@ -42,6 +42,8 @@
|
||||
|
||||
- `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be.
|
||||
|
||||
- `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.11-notable-changes}
|
||||
|
||||
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
|
||||
|
||||
@ -159,6 +159,15 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
claimTokenFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
If set, automatically registers the agent using the given claim token
|
||||
file.
|
||||
'';
|
||||
};
|
||||
|
||||
enableAnalyticsReporting = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
@ -260,7 +269,25 @@ in {
|
||||
PrivateTmp = true;
|
||||
ProtectControlGroups = true;
|
||||
PrivateMounts = true;
|
||||
};
|
||||
} // (lib.optionalAttrs (cfg.claim_token_file != null) {
|
||||
LoadCredential = [
|
||||
"netdata_claim_token:${cfg.claimTokenFile}"
|
||||
];
|
||||
|
||||
ExecStartPre = pkgs.writeShellScript "netdata-claim" ''
|
||||
set -euo pipefail
|
||||
|
||||
if [[ -f /var/lib/netdata/cloud.d/claimed_id ]]; then
|
||||
# Already registered
|
||||
exit
|
||||
fi
|
||||
|
||||
exec ${cfg.package}/bin/netdata-claim.sh \
|
||||
-token="$(< "$CREDENTIALS_DIRECTORY/netdata_claim_token")" \
|
||||
-url=https://app.netdata.cloud \
|
||||
-daemon-not-running
|
||||
'';
|
||||
});
|
||||
};
|
||||
|
||||
systemd.enableCgroupAccounting = true;
|
||||
|
||||
@ -62,10 +62,6 @@ in
|
||||
description = lib.mdDoc "Port where lemmy should listen for incoming requests.";
|
||||
};
|
||||
|
||||
options.federation = {
|
||||
enabled = (mkEnableOption (lib.mdDoc "activitypub federation")) // { visible = false; };
|
||||
};
|
||||
|
||||
options.captcha = {
|
||||
enabled = mkOption {
|
||||
type = types.bool;
|
||||
@ -85,10 +81,6 @@ in
|
||||
|
||||
config =
|
||||
lib.mkIf cfg.enable {
|
||||
warnings = lib.optional (cfg.settings.federation.enabled) ''
|
||||
This option was removed in 0.17.0 and no longer has any effect.
|
||||
'';
|
||||
|
||||
services.lemmy.settings = (mapAttrs (name: mkDefault)
|
||||
{
|
||||
bind = "127.0.0.1";
|
||||
@ -194,10 +186,16 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
assertions = [{
|
||||
assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql";
|
||||
message = "if you want to create the database locally, you need to use a local database";
|
||||
}];
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql";
|
||||
message = "if you want to create the database locally, you need to use a local database";
|
||||
}
|
||||
{
|
||||
assertion = (!(hasAttrByPath ["federation"] cfg.settings)) && (!(hasAttrByPath ["federation" "enabled"] cfg.settings));
|
||||
message = "`services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect";
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.lemmy = {
|
||||
description = "Lemmy server";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, buildEnv, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -261,6 +261,7 @@ in {
|
||||
StateDirectory = "netbox";
|
||||
StateDirectoryMode = "0750";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
};
|
||||
in {
|
||||
netbox-migration = {
|
||||
@ -276,13 +277,18 @@ in {
|
||||
ExecStart = ''
|
||||
${pkg}/bin/netbox migrate
|
||||
'';
|
||||
PrivateTmp = true;
|
||||
};
|
||||
};
|
||||
|
||||
netbox = {
|
||||
description = "NetBox WSGI Service";
|
||||
documentation = [ "https://docs.netbox.dev/" ];
|
||||
|
||||
wantedBy = [ "netbox.target" ];
|
||||
after = [ "netbox-migration.service" ];
|
||||
|
||||
after = [ "network-online.target" "netbox-migration.service" ];
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
preStart = ''
|
||||
${pkg}/bin/netbox trace_paths --no-input
|
||||
@ -290,9 +296,7 @@ in {
|
||||
${pkg}/bin/netbox remove_stale_contenttypes --no-input
|
||||
'';
|
||||
|
||||
environment = {
|
||||
PYTHONPATH = pkg.pythonPath;
|
||||
};
|
||||
environment.PYTHONPATH = pkg.pythonPath;
|
||||
|
||||
serviceConfig = defaultServiceConfig // {
|
||||
ExecStart = ''
|
||||
@ -300,32 +304,37 @@ in {
|
||||
--bind ${cfg.listenAddress}:${toString cfg.port} \
|
||||
--pythonpath ${pkg}/opt/netbox/netbox
|
||||
'';
|
||||
PrivateTmp = true;
|
||||
};
|
||||
};
|
||||
|
||||
netbox-rq = {
|
||||
description = "NetBox Request Queue Worker";
|
||||
documentation = [ "https://docs.netbox.dev/" ];
|
||||
|
||||
wantedBy = [ "netbox.target" ];
|
||||
after = [ "netbox.service" ];
|
||||
|
||||
environment = {
|
||||
PYTHONPATH = pkg.pythonPath;
|
||||
};
|
||||
environment.PYTHONPATH = pkg.pythonPath;
|
||||
|
||||
serviceConfig = defaultServiceConfig // {
|
||||
ExecStart = ''
|
||||
${pkg}/bin/netbox rqworker high default low
|
||||
'';
|
||||
PrivateTmp = true;
|
||||
};
|
||||
};
|
||||
|
||||
netbox-housekeeping = {
|
||||
description = "NetBox housekeeping job";
|
||||
after = [ "netbox.service" ];
|
||||
documentation = [ "https://docs.netbox.dev/" ];
|
||||
|
||||
environment = {
|
||||
PYTHONPATH = pkg.pythonPath;
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
environment.PYTHONPATH = pkg.pythonPath;
|
||||
|
||||
serviceConfig = defaultServiceConfig // {
|
||||
Type = "oneshot";
|
||||
@ -338,10 +347,17 @@ in {
|
||||
|
||||
systemd.timers.netbox-housekeeping = {
|
||||
description = "Run NetBox housekeeping job";
|
||||
wantedBy = [ "timers.target" ];
|
||||
documentation = [ "https://docs.netbox.dev/" ];
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
timerConfig = {
|
||||
OnCalendar = "daily";
|
||||
AccuracySec = "1h";
|
||||
Persistent = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -85,7 +85,8 @@ let
|
||||
hash = "sha256-yfVzZV8G4AUDM8+yS9finzobpOb1PUEPgBWFhEY4nFQ=";
|
||||
};
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zrythm";
|
||||
version = "1.0.0-beta.4.9.1";
|
||||
|
||||
@ -172,6 +173,8 @@ in stdenv.mkDerivation rec {
|
||||
# Zrythm uses meson to build, but requires cmake for dependency detection.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
mesonFlags = [
|
||||
"-Db_lto=false"
|
||||
"-Dcarla=enabled"
|
||||
|
||||
@ -1,38 +1,75 @@
|
||||
{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc, openssl, unbound
|
||||
, readline, libsodium, rapidjson
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost
|
||||
, libsodium
|
||||
, openssl
|
||||
, rapidjson
|
||||
, readline
|
||||
, unbound
|
||||
, zeromq
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
# submodules
|
||||
miniupnp = fetchFromGitHub {
|
||||
owner = "miniupnp";
|
||||
repo = "miniupnp";
|
||||
rev = "miniupnpc_2_2_1";
|
||||
hash = "sha256-opd0hcZV+pjC3Mae3Yf6AR5fj6xVwGm9LuU5zEPxBKc=";
|
||||
};
|
||||
supercop = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "supercop";
|
||||
rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9";
|
||||
hash = "sha256-26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE=";
|
||||
};
|
||||
randomwow = fetchFromGitHub {
|
||||
owner = "wownero-project";
|
||||
repo = "RandomWOW";
|
||||
rev = "607bad48f3687c2490d90f8c55efa2dcd7cbc195";
|
||||
hash = "sha256-CJv96TbPv1k/C7MQWEntE6khIRX1iIEiF9wEdsQGiFQ=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wownero";
|
||||
version = "0.8.0.1";
|
||||
randomwowVersion = "1.1.7";
|
||||
version = "0.11.0.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.wownero.com";
|
||||
owner = "wownero";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wownero-project";
|
||||
repo = "wownero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+cUdousEiZMNwqhTvjoqw/k21x3dg7Lhb/5KyNUGrjQ=";
|
||||
fetchSubmodules = false;
|
||||
hash = "sha256-zmGsSbPpVwL0AhCQkdMKORruM5kYrrLe/BYfMphph8c=";
|
||||
};
|
||||
|
||||
randomwow = fetchFromGitea {
|
||||
domain = "git.wownero.com";
|
||||
owner = "wownero";
|
||||
repo = "RandomWOW";
|
||||
rev = randomwowVersion;
|
||||
sha256 = "sha256-JzyRlHwM8rmJ5OaKHz+6vHGfpSz+X4zkFAKn4Jmo+EE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound rapidjson readline libsodium
|
||||
boost
|
||||
libsodium
|
||||
openssl
|
||||
rapidjson
|
||||
readline
|
||||
unbound
|
||||
zeromq
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
rm -r $sourceRoot/external/RandomWOW
|
||||
ln -s ${randomwow} $sourceRoot/external/RandomWOW
|
||||
rm -r $sourceRoot/external/miniupnp
|
||||
ln -s ${miniupnp} $sourceRoot/external/miniupnp
|
||||
|
||||
rm -r $sourceRoot/external/randomwow
|
||||
ln -s ${randomwow} $sourceRoot/external/randomwow
|
||||
|
||||
rm -r $sourceRoot/external/supercop
|
||||
ln -s ${supercop} $sourceRoot/external/supercop
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
@ -52,9 +89,9 @@ stdenv.mkDerivation rec {
|
||||
signatures using different participants for the same tx outputs on
|
||||
opposing forks.
|
||||
'';
|
||||
homepage = "https://wownero.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://wownero.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
From 4f64ad191ec79b9f40843f88e3ac5910720636da Mon Sep 17 00:00:00 2001
|
||||
From: Changsheng Wu <Congee@users.noreply.github.com>
|
||||
Date: Fri, 9 Jun 2023 15:41:53 -0400
|
||||
Subject: [PATCH] Update Cargo.toml
|
||||
|
||||
---
|
||||
adapter/Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/adapter/Cargo.toml b/adapter/Cargo.toml
|
||||
index bc86723..f5f26ce 100644
|
||||
--- a/adapter/Cargo.toml
|
||||
+++ b/adapter/Cargo.toml
|
||||
@@ -39,7 +39,7 @@ winapi = { version = "0.3.8", features = ["std", "wincon", "namedpipeapi"] }
|
||||
winreg = "0.6.2"
|
||||
|
||||
[lib]
|
||||
-crate-type = ["staticlib"]
|
||||
+crate-type = ["dylib", "rlib"]
|
||||
|
||||
[[bin]]
|
||||
name = "codelldb"
|
||||
@ -1,8 +1,7 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6ae4dfb..519f544 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -16,13 +16,6 @@ endif()
|
||||
@@ -16,13 +16,6 @@
|
||||
set(VERSION "${VERSION}${VERSION_SUFFIX}")
|
||||
message("Version ${VERSION}")
|
||||
|
||||
@ -16,11 +15,11 @@ index 6ae4dfb..519f544 100644
|
||||
if (CMAKE_SYSROOT)
|
||||
set(CMAKE_C_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_C_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_CXX_FLAGS}")
|
||||
@@ -93,16 +86,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
|
||||
@@ -102,16 +95,6 @@
|
||||
configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
-# Run 'npm install'
|
||||
-# Install node_modules
|
||||
-execute_process(
|
||||
- COMMAND ${NPM} ci # like install, but actually respects package-lock file.
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
@ -30,10 +29,10 @@ index 6ae4dfb..519f544 100644
|
||||
- message(FATAL_ERROR "npm intall failed: ${Result}")
|
||||
-endif()
|
||||
-
|
||||
# Copy it back, so we can commit the lock file.
|
||||
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
@@ -154,6 +137,7 @@ add_custom_target(tests
|
||||
# Resolve $refs
|
||||
execute_process(
|
||||
COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json
|
||||
@@ -169,6 +152,7 @@
|
||||
|
||||
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_BINARY_DIR}/README.md)
|
||||
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md ${CMAKE_CURRENT_BINARY_DIR}/CHANGELOG.md)
|
||||
@ -41,7 +40,7 @@ index 6ae4dfb..519f544 100644
|
||||
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/lldb.png ${CMAKE_CURRENT_BINARY_DIR}/images/lldb.png)
|
||||
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/user.svg ${CMAKE_CURRENT_BINARY_DIR}/images/user.svg)
|
||||
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/users.svg ${CMAKE_CURRENT_BINARY_DIR}/images/users.svg)
|
||||
@@ -170,6 +154,7 @@ add_custom_target(dev_debugging
|
||||
@@ -185,6 +169,7 @@
|
||||
set(PackagedFilesBootstrap
|
||||
README.md
|
||||
CHANGELOG.md
|
||||
@ -49,4 +48,3 @@ index 6ae4dfb..519f544 100644
|
||||
extension.js
|
||||
images/*
|
||||
syntaxes/*
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5";
|
||||
let
|
||||
publisher = "vadimcn";
|
||||
pname = "vscode-lldb";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
vscodeExtUniqueId = "${publisher}.${pname}";
|
||||
vscodeExtPublisher = publisher;
|
||||
@ -15,7 +15,7 @@ let
|
||||
owner = "vadimcn";
|
||||
repo = "vscode-lldb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DqxdZtSW8TZaOFGXOZQ7a4tmgRj6iAWDppCNomdfVxY=";
|
||||
hash = "sha256-6QmYRlSv8jY3OE3RcYuZt+c3z6GhFc8ESETVfCfF5RI=";
|
||||
};
|
||||
|
||||
# need to build a custom version of lldb and llvm for enhanced rust support
|
||||
@ -25,7 +25,7 @@ let
|
||||
pname = "${pname}-adapter";
|
||||
inherit version src;
|
||||
|
||||
cargoSha256 = "sha256-+hfNkr9cZbOcWdWKUWUqDj9a0PKjKeApFXYZzS1XokE=";
|
||||
cargoHash = "sha256-Qq2igtH1XIB+NAEES6hdNZcMbEmaFN69qIJ+gTYupvQ=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -38,6 +38,8 @@ let
|
||||
"--bin=codelldb"
|
||||
];
|
||||
|
||||
patches = [ ./adapter-output-shared_object.patch ];
|
||||
|
||||
# Tests are linked to liblldb but it is not available here.
|
||||
doCheck = false;
|
||||
};
|
||||
@ -46,7 +48,7 @@ let
|
||||
pname = "${pname}-node-deps";
|
||||
inherit version src;
|
||||
|
||||
npmDepsHash = "sha256-Cdlq1jxHSCfPjXhasClc6XzEUp3vlLgkStbhYtCyc7E=";
|
||||
npmDepsHash = "sha256-fMKGi+AJTMlWl7SQtZ21hUwOLgqlFYDhwLvEergQLfI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
@ -82,12 +84,6 @@ in stdenv.mkDerivation {
|
||||
|
||||
patches = [ ./cmake-build-extension-only.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# temporary patch for forgotten version updates
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "1.9.0" ${version}
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
cp -r ${nodeDeps}/lib/node_modules .
|
||||
'';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell ../../update-shell.nix -i bash -p wget prefetch-npm-deps
|
||||
#! nix-shell ../../update-shell.nix -i bash -p nix-prefetch-github prefetch-npm-deps
|
||||
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
@ -18,7 +18,7 @@ version="$1"
|
||||
if [[ $# -ne 1 ]]; then
|
||||
# no version specified, find the newest one
|
||||
version=$(
|
||||
curl -s "https://api.github.com/repos/$owner/$repo/releases" |
|
||||
curl -sL "https://api.github.com/repos/$owner/$repo/releases" |
|
||||
jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output |
|
||||
sed 's/[\"v]//'
|
||||
)
|
||||
@ -29,19 +29,18 @@ if grep -q 'cargoSha256 = ""' ./default.nix; then
|
||||
fi
|
||||
if [[ "$version" == "$old_version" ]]; then
|
||||
echo "Up to date: $version"
|
||||
exit
|
||||
fi
|
||||
echo "$old_version -> $version"
|
||||
|
||||
# update hashes
|
||||
sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile"
|
||||
srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version")
|
||||
srcHash=$(nix-prefetch-github vadimcn vscode-lldb --rev "v$version" | jq --raw-output .sha256)
|
||||
sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile"
|
||||
cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
|
||||
sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile"
|
||||
|
||||
pushd $TMPDIR
|
||||
wget https://raw.githubusercontent.com/$owner/$repo/v${version}/package-lock.json
|
||||
curl -LO https://raw.githubusercontent.com/$owner/$repo/v${version}/package-lock.json
|
||||
npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
|
||||
popd
|
||||
sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'$npmDepsHash'"#' --in-place "$nixFile"
|
||||
|
||||
@ -24,21 +24,21 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "10nanw9xbns3wkcy1vr0shqk2719cfql0aj0lxbza74mhm290izg";
|
||||
x86_64-darwin = "1rffjb8p4vjwgvzrzpwqs3mb2hsf9hdml0r8zhzrzxlvrzzkkfdi";
|
||||
aarch64-linux = "1fgvgma8s1y0fm3ynz9diz2plffmxjpgf0w2flnr5zr14yvzi072";
|
||||
aarch64-darwin = "071vr52mcc0wrqa90kimmpmyj91nxwhg3jkfwcdssw2cr7qpjw67";
|
||||
armv7l-linux = "0b4d70d9qxlafn2mmf7vnmg09gdmv3cr57f32nvsn361z18y7yi2";
|
||||
x86_64-linux = "0ykchyksfc7aqar2f691jva36v0syn575rj6hydws0y79pplvinh";
|
||||
x86_64-darwin = "1zayc6z4zfkjb238dx51b1f2s9clqzhxhvb91j5w0ayqk735bd5d";
|
||||
aarch64-linux = "1nbnprf6sjqqrw7qha0r6f78n7jjvhn8kv1wxh5pi535nlmxza14";
|
||||
aarch64-darwin = "0lijfhlbj0vsjd6kdfr0fmks2spjazrzwnlxxw0ka80psxghavs6";
|
||||
armv7l-linux = "0dhgb1lxq8r4fk6nkb14h986w3dj19llvjvn8jq4mxdbscnik2j5";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.79.1";
|
||||
version = "1.79.2";
|
||||
pname = "vscode";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "b380da4ef1ee00e224a15c1d4d9793e27c2b6302";
|
||||
rev = "695af097c7bd098fbf017ce3ac85e09bbc5dda06";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@ -62,7 +62,7 @@ in
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "0732wpl4fjknhn423k23zrcqz9psjj1iy8lqa0fc8970n1m7i58b";
|
||||
sha256 = "0xbc20vh6rj2g6wvw73k8wqm1lxwirph3swwilq5f9hmkzha1z7i";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/1d7e8ae4edc53a3380dfea88329b8b8337db1c52.patch";
|
||||
sha256 = "sha256-SV1waz2JSKiM6itwkqwlE3aOZCcOl8iyBr06tyYlefo=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE='Release'"
|
||||
"-DENABLE_FFMPEG='true'"
|
||||
|
||||
@ -14,19 +14,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "21.3.7";
|
||||
version = "21.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgraph";
|
||||
repo = "drawio-desktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-f8QQA8qehB7wYJRoKizPxewBTVV64kxaBg2oTTNelBU=";
|
||||
hash = "sha256-wiLeRku8/v7bB/Ml6rKPdZRtxJYFMAt3Xz9MixXhHnw=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-gLt6a2Kq1LIzFiSnqLKKFTg8sd3Wrqsdys23SCFcrQ0=";
|
||||
hash = "sha256-phB/KPIkgCJT4wEDmUWvaXj0ZPih0EQY40LbRfA58Ro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, appimageTools
|
||||
, patchelf
|
||||
, icu
|
||||
}:
|
||||
let
|
||||
pname = "jetbrains-toolbox";
|
||||
@ -54,7 +54,9 @@ stdenv.mkDerivation {
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
|
||||
makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} --append-flags "--update-failed"
|
||||
makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} \
|
||||
--append-flags "--update-failed" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [icu]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -18,7 +18,7 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
|
||||
nativeBuildInputs = [ pkg-config makeWrapper python3 ];
|
||||
nativeBuildInputs = [ pkg-config makeWrapper python3 qtbase ];
|
||||
buildInputs = [
|
||||
qtbase qtsvg file/*for libmagic*/ bc
|
||||
hunspell # enchant
|
||||
|
||||
26
pkgs/applications/misc/wallust/default.nix
Normal file
26
pkgs/applications/misc/wallust/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{lib, fetchgit, rustPlatform}:
|
||||
|
||||
let
|
||||
repoUrl = "https://codeberg.org/explosion-mental/wallust";
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "wallust";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "${repoUrl}.git";
|
||||
rev = version;
|
||||
sha256 = "sha256-7zSUyj8Zzk8rsDe7ukPaV02HH7VQ+yjh+wM5TZzJxSA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-toqt5vqEsflhqFargEcCXrb6ab748mn6k6/RH5d/3RA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A better pywall";
|
||||
homepage = repoUrl;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [onemoresuza];
|
||||
downloadPage = "${repoUrl}/releases/tag/${version}";
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "wallust";
|
||||
};
|
||||
}
|
||||
46
pkgs/applications/science/biology/kalign/default.nix
Normal file
46
pkgs/applications/science/biology/kalign/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, llvmPackages
|
||||
, enableSse4_1 ? stdenv.hostPlatform.sse4_1Support
|
||||
, enableAvx ? stdenv.hostPlatform.avxSupport
|
||||
, enableAvx2 ? stdenv.hostPlatform.avx2Support
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kalign";
|
||||
version = "3.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimoLassmann";
|
||||
repo = "kalign";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-QufTiaiRcNOnLhOO4cnOE9bNcj9mlCg/ERFIHJB8KOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.cc.isClang [
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
cmakeFlags =
|
||||
# these flags are ON by default
|
||||
lib.optional (!enableSse4_1) "-DENABLE_SSE=OFF"
|
||||
++ lib.optional (!enableAvx) "-DENABLE_AVX=OFF"
|
||||
++ lib.optional (!enableAvx2) "-DENABLE_AVX2=OFF";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "A fast multiple sequence alignment program";
|
||||
homepage = "https://github.com/TimoLassmann/kalign";
|
||||
changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxdvdrip";
|
||||
version = "1.76";
|
||||
version = "1.77";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz";
|
||||
sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6";
|
||||
hash = "sha256-OzHrscftsCmJvSw7bb/Z2WDP322VCuQDY58dW2OqxB8=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
postPatch = ''
|
||||
sed -i -e s,/usr/local,$out, -e s,/etc,$out/etc,g Makefile
|
||||
sed -i -e s,/usr/local,$out, buffer/Makefile
|
||||
sed -i -e s,/usr/local,$out, mbuffer/Makefile
|
||||
makeFlags="$makeFlags PREFIX=$out"
|
||||
'';
|
||||
|
||||
|
||||
19
pkgs/applications/video/tanidvr/default.nix
Normal file
19
pkgs/applications/video/tanidvr/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tanidvr";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tanidvr/TaniDVR/${pname}-${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0irwwf6mb72n3y4xcrl3s081nbnldvdlc6ypjqxa4p32c1d0g6ql";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "CLI tool for managing and capturing video from DVRs which use the DVR-IP protocol";
|
||||
homepage = "https://tanidvr.sourceforge.net/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ pho ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
110
pkgs/development/compilers/chicken/5/deps.toml
generated
110
pkgs/development/compilers/chicken/5/deps.toml
generated
@ -114,9 +114,9 @@ version = "3.7.0"
|
||||
[arcadedb]
|
||||
dependencies = ["uri-common", "medea"]
|
||||
license = "zlib-acknowledgement"
|
||||
sha256 = "0a6shlwd9zyrlyw8ayc0vxdlj6wbksi5ii8wfvxyi885b55bxk6g"
|
||||
sha256 = "1s370xms0kf1z6a4pbg5lp931zr8yl0r5szwg3lji99cdm87cjij"
|
||||
synopsis = "An ArcadeDB database driver for CHICKEN Scheme."
|
||||
version = "0.5"
|
||||
version = "0.6"
|
||||
|
||||
[args]
|
||||
dependencies = ["srfi-1", "srfi-13", "srfi-37"]
|
||||
@ -219,9 +219,9 @@ version = "1.0"
|
||||
[beaker]
|
||||
dependencies = ["begin-syntax", "debugger-protocol", "schematic", "srfi-1", "srfi-13", "srfi-14", "srfi-69", "vector-lib", "with-current-directory", "module-declarations"]
|
||||
license = "bsd"
|
||||
sha256 = "0clfw7z2j3b6hyj78g61n7nxf07bcksvdcbgs3jiv99rr1vaj9z5"
|
||||
sha256 = "1nxzqjwh3bi2zyifdpn0wb86352rizjpfl3lfi34f3g6m95avmmg"
|
||||
synopsis = "Lab supplies for CHICKEN development"
|
||||
version = "0.0.20"
|
||||
version = "0.0.22"
|
||||
|
||||
[begin-syntax]
|
||||
dependencies = ["matchable", "module-declarations"]
|
||||
@ -314,6 +314,13 @@ sha256 = "0m78rb2q0znixpiflcrndlk708g4mbw7yh1ynkvk3zzvln0d3wgi"
|
||||
synopsis = "Bindings to the Blosc multi-threaded meta-compressor library"
|
||||
version = "1.1"
|
||||
|
||||
[botan]
|
||||
dependencies = ["srfi-1", "srfi-13", "srfi-14"]
|
||||
license = "bsd-2-clause"
|
||||
sha256 = "1j2h6hhvwdr7d7kgm5b0nc5nmx23a35av7rvwcajlxxv9iafmdh2"
|
||||
synopsis = "Bindings to the Botan cryptographic library"
|
||||
version = "2.13.20191214-0"
|
||||
|
||||
[box]
|
||||
dependencies = []
|
||||
license = "bsd"
|
||||
@ -324,16 +331,16 @@ version = "3.6.0"
|
||||
[breadcrumbs]
|
||||
dependencies = ["srfi-1"]
|
||||
license = "bsd"
|
||||
sha256 = "1l49ahr6vkx0ihkmmgsy0z72k7livl9gsmdbyj2q1i25lb14kp6s"
|
||||
sha256 = "1n60k0ryp447fh4f1an7ki8c1kc2ll1v1cbhgrxvmwcx3v03d767"
|
||||
synopsis = "Breadcrumbs for web pages"
|
||||
version = "1.1"
|
||||
version = "1.2"
|
||||
|
||||
[breadline]
|
||||
dependencies = ["apropos", "srfi-18"]
|
||||
license = "gpl-3"
|
||||
sha256 = "05mmfr38wydifz6i5h12y07p6vj8xn8nvrxpiazbnyh6zwbswfhk"
|
||||
sha256 = "1rvppf2aci4dxn6a74nzzj1iw7is65ad38fbvrr9harazfx6j4jy"
|
||||
synopsis = "Bindings to readline"
|
||||
version = "0.10"
|
||||
version = "0.11"
|
||||
|
||||
[brev-separate]
|
||||
dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"]
|
||||
@ -408,9 +415,9 @@ version = "0.4"
|
||||
[check-errors]
|
||||
dependencies = []
|
||||
license = "bsd"
|
||||
sha256 = "0zbax9k6k4m490vhkpvyj0dsq87i58l39lakldmd0yfqm7da3lfz"
|
||||
sha256 = "1ra8pvs0qnfqsjbrsn0k94drwx5ydvhapziv6dcqcb118iimnrmd"
|
||||
synopsis = "Argument checks & errors"
|
||||
version = "3.7.0"
|
||||
version = "3.7.1"
|
||||
|
||||
[checks]
|
||||
dependencies = ["simple-exceptions"]
|
||||
@ -569,9 +576,9 @@ version = "1.0"
|
||||
[condition-utils]
|
||||
dependencies = ["srfi-1", "srfi-69", "check-errors"]
|
||||
license = "bsd"
|
||||
sha256 = "0v2k0spikmrwjb5j360hgi126k1zahnjswhfa2as4mlz6pwl5aqi"
|
||||
sha256 = "1srb3lgnfvlpwn31w72jcg5wlghlgpp0khgwlk8cqy9ll5piqwqk"
|
||||
synopsis = "SRFI 12 Condition Utilities"
|
||||
version = "2.2.1"
|
||||
version = "2.2.2"
|
||||
|
||||
[continuations]
|
||||
dependencies = []
|
||||
@ -751,9 +758,9 @@ version = "1.3.1"
|
||||
[dust]
|
||||
dependencies = ["http-client", "memory-mapped-files", "openssl", "posix-groups", "begin-syntax", "matchable", "module-declarations"]
|
||||
license = "bsd"
|
||||
sha256 = "1invlk61z32x3f834qapwbqbjab04153c5rs06gaqa6ip83mraj6"
|
||||
sha256 = "1r4yfs78az2p7szgsnlcnlfrqkivj9am7vm1sh2b29rjffkqnhp3"
|
||||
synopsis = "Fetch and install CHICKEN versions"
|
||||
version = "0.0.15"
|
||||
version = "0.0.16"
|
||||
|
||||
[dwim-sort]
|
||||
dependencies = ["brev-separate", "sequences", "srfi-1", "match-generics"]
|
||||
@ -1374,9 +1381,9 @@ version = "0.3"
|
||||
[ipfs]
|
||||
dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"]
|
||||
license = "unlicense"
|
||||
sha256 = "01ar16bzy0q56zbnv19f0p1y0ch182jjfr9jihfnbj0fgpz8bvxp"
|
||||
sha256 = "0kxir3f0f2w03wrsgdfn81hdmyzcrz6yglaqm369xrra2cpd4akb"
|
||||
synopsis = "IPFS HTTP API for Scheme"
|
||||
version = "0.0.10"
|
||||
version = "0.0.11"
|
||||
|
||||
[irc]
|
||||
dependencies = ["matchable", "regex", "srfi-1"]
|
||||
@ -1430,9 +1437,9 @@ version = "7.0"
|
||||
[json-rpc]
|
||||
dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"]
|
||||
license = "mit"
|
||||
sha256 = "04488ykkh8qwzfly3i86m7vpx10s6ixr2s10m390f587ls15qkyd"
|
||||
sha256 = "0gh9w6mm6d3y2325m8cci743g1mh7q7bx3d4ygp47pj6mwjgihlz"
|
||||
synopsis = "A JSON RPC library for R7RS scheme."
|
||||
version = "0.2.10"
|
||||
version = "0.3.0"
|
||||
|
||||
[json-utils]
|
||||
dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"]
|
||||
@ -1535,9 +1542,9 @@ version = "1.2.1"
|
||||
[list-utils]
|
||||
dependencies = ["utf8", "srfi-1", "check-errors"]
|
||||
license = "bsd"
|
||||
sha256 = "0s48ps6ymi9h6xgx190y7bvipasspqm236fg7n1yiayjgyivgcpp"
|
||||
sha256 = "0wqmsvh3sfgp8ssh98n8y615lxnjlcda1k375jfss7vf8k5xn032"
|
||||
synopsis = "list-utils"
|
||||
version = "2.4.1"
|
||||
version = "2.4.3"
|
||||
|
||||
[live-define]
|
||||
dependencies = ["matchable"]
|
||||
@ -1605,9 +1612,9 @@ version = "3"
|
||||
[lsp-server]
|
||||
dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-130", "srfi-133", "srfi-18", "srfi-69", "uri-generic", "utf8"]
|
||||
license = "mit"
|
||||
sha256 = "1qxrfjmxr9azzsqamvlqr942835m1d8pr7k9a47zc9fkpgp1smy4"
|
||||
sha256 = "1jqdmzjdixmza3h3m363bdm1kmwpr2di14ig5a9rh4aw33zaax5v"
|
||||
synopsis = "LSP Server for CHICKEN."
|
||||
version = "0.2.2"
|
||||
version = "0.3.0"
|
||||
|
||||
[macaw]
|
||||
dependencies = []
|
||||
@ -1689,9 +1696,9 @@ version = "4.5.1"
|
||||
[matrico]
|
||||
dependencies = []
|
||||
license = "zlib-acknowledgement"
|
||||
sha256 = "0m7shfhmzzlqxspc97mbqdcr4zry7im1lrz8smr6wc7m9r8jf2p0"
|
||||
sha256 = "0ng09xbk8229nhq4s8f8rxgrgigf81qr685mggvk2lm5p7kckpjq"
|
||||
synopsis = "A flonum matrix module for CHICKEN Scheme."
|
||||
version = "0.3rel"
|
||||
version = "0.5rel"
|
||||
|
||||
[md5]
|
||||
dependencies = ["message-digest-primitive"]
|
||||
@ -1773,9 +1780,9 @@ version = "0.7"
|
||||
[micro-benchmark]
|
||||
dependencies = ["micro-stats", "srfi-1"]
|
||||
license = "gplv3"
|
||||
sha256 = "1dz9r9jbjq0zgpwmh2vl9wdkj57rprnmwarbk3x2y3ah5hn5m1nn"
|
||||
sha256 = "0ahvxdm350bc9v80gnb8ccmjqqp60jznfjkx7w5ypf0q61mnj8sj"
|
||||
synopsis = "Easily create micro-benchmarks"
|
||||
version = "0.0.18"
|
||||
version = "0.0.19"
|
||||
|
||||
[micro-stats]
|
||||
dependencies = ["srfi-1", "sequences", "sequences-utils"]
|
||||
@ -1815,9 +1822,9 @@ version = "1.0.3"
|
||||
[module-declarations]
|
||||
dependencies = ["matchable", "srfi-1"]
|
||||
license = "bsd"
|
||||
sha256 = "11jvzk59h8mmczh01p3s2dgdnrdd35ig55pw5whs7mw4fjjil6hz"
|
||||
sha256 = "079zs0cc7bmc1macvsh79q1x4rbjqw25hcvlcis8xxg3952vlqfg"
|
||||
synopsis = "Module declarations"
|
||||
version = "0.2.1"
|
||||
version = "0.3.1"
|
||||
|
||||
[monad]
|
||||
dependencies = ["srfi-1"]
|
||||
@ -1826,6 +1833,13 @@ sha256 = "1xd24plxnwi9yssmw2in008biv2xf4iwwln6xswx781ankppqpg9"
|
||||
synopsis = "Monads"
|
||||
version = "5.0"
|
||||
|
||||
[monocypher]
|
||||
dependencies = []
|
||||
license = "bsd-2-clause"
|
||||
sha256 = "15lpm5bmqn4b8mh5wws66jay5flwj9y185zdjxj5qc23i5q3cwh0"
|
||||
synopsis = "Monocypher cryptographic library"
|
||||
version = "4.0.1-0"
|
||||
|
||||
[moremacros]
|
||||
dependencies = ["srfi-69", "miscmacros", "check-errors"]
|
||||
license = "bsd"
|
||||
@ -2207,9 +2221,9 @@ version = "0.1.1"
|
||||
[r7rs]
|
||||
dependencies = ["matchable", "srfi-1", "srfi-13"]
|
||||
license = "bsd"
|
||||
sha256 = "0l9smsii64n6rxvxf0bgjnpx16341zv7xh7xr60nk6f88kdkl03q"
|
||||
sha256 = "1lxby5hj8bwqdwys5324fvrj6q9j4dp10mlvla3qjfc9scppxj79"
|
||||
synopsis = "R7RS compatibility"
|
||||
version = "1.0.7"
|
||||
version = "1.0.8"
|
||||
|
||||
[rabbit]
|
||||
dependencies = ["srfi-1"]
|
||||
@ -2604,18 +2618,25 @@ synopsis = "An implementation of skiplists"
|
||||
version = "1.0.2"
|
||||
|
||||
[slib-arraymap]
|
||||
dependencies = ["srfi-1", "srfi-63"]
|
||||
dependencies = ["srfi-1", "srfi-63", "slib-compat"]
|
||||
license = "bsd"
|
||||
sha256 = "157h7qrwqqkrd3xw88if054pi2719hkfm0pysq8v8w7yma65wvln"
|
||||
sha256 = "08djsc0j6kacf07a59f58clka94wq4lp8ry3p8203sx3lbx1s8qw"
|
||||
synopsis = "The SLIB applicative routines for the arrays library"
|
||||
version = "1.1.3"
|
||||
version = "1.1.4"
|
||||
|
||||
[slib-charplot]
|
||||
dependencies = ["slib-arraymap", "srfi-63"]
|
||||
dependencies = ["slib-arraymap", "srfi-63", "slib-compat"]
|
||||
license = "artistic"
|
||||
sha256 = "0m9vjczx7w9m9kvm9vq1f6qxfdkxxh1f0msdrnyg5h4xn4dsnhww"
|
||||
sha256 = "1ijcvs9y2vxmxg5834s4mprkinxhky0xdl3yksysmg9h9p82il2z"
|
||||
synopsis = "The SLIB character plotting library"
|
||||
version = "1.2.1"
|
||||
version = "1.2.2"
|
||||
|
||||
[slib-compat]
|
||||
dependencies = ["srfi-1"]
|
||||
license = "artistic"
|
||||
sha256 = "0pk00087wbxwyyrn0qa1261ry2c55mxz9jgh95adl6lvgdvajchy"
|
||||
synopsis = "CHICKEN SLIB compatibility library"
|
||||
version = "1.0.0"
|
||||
|
||||
[slib-wt-tree]
|
||||
dependencies = ["typed-records"]
|
||||
@ -2669,9 +2690,9 @@ version = "0.3.3"
|
||||
[sparse-vectors]
|
||||
dependencies = ["srfi-1", "record-variants"]
|
||||
license = "bsd"
|
||||
sha256 = "1cqimy2qcjhzfjx1q7ids1wqg43wzpzz56cn193fwm75szqg0xdj"
|
||||
sha256 = "0nmk6c9mhls38lyp0d8a9f3xh94jbl2dqbmqr9pab23pnx4hha1j"
|
||||
synopsis = "Arbitrarily large vectors"
|
||||
version = "1.0.1"
|
||||
version = "1.1.0"
|
||||
|
||||
[spiffy-cgi-handlers]
|
||||
dependencies = ["spiffy", "intarweb", "uri-common", "socket", "records", "srfi-1", "srfi-18", "srfi-13", "miscmacros"]
|
||||
@ -3079,6 +3100,13 @@ sha256 = "0ynasgp03kqd6nhqmcnp4cjf87p3pkjaqi2x860hma79xsslyp8n"
|
||||
synopsis = "SRFI 217: Integer Sets"
|
||||
version = "0.2"
|
||||
|
||||
[srfi-227]
|
||||
dependencies = ["srfi-1"]
|
||||
license = "mit"
|
||||
sha256 = "0vrpgqdmwdaphy0szskxyl2x6xhwycgvi6flwi5v6m2zi5cd3j1c"
|
||||
synopsis = "SRFI 227: Optional Arguments"
|
||||
version = "1.1"
|
||||
|
||||
[srfi-232]
|
||||
dependencies = ["srfi-1"]
|
||||
license = "mit"
|
||||
@ -3591,11 +3619,11 @@ synopsis = "tracing and breakpoints"
|
||||
version = "2.0"
|
||||
|
||||
[transducers]
|
||||
dependencies = ["srfi-1", "srfi-133", "srfi-143", "srfi-160", "check-errors"]
|
||||
dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors"]
|
||||
license = "mit"
|
||||
sha256 = "01xfqh94cn3qid9ydlmsyyh9drp8bzy8mp1q13b2vksm4yqp077w"
|
||||
sha256 = "0mkrrfvskwgy5w8c9gz21np3p9857sm8fylq0hjz608jaxzybpcz"
|
||||
synopsis = "Transducers for working with foldable data types."
|
||||
version = "0.3.1"
|
||||
version = "0.4.0"
|
||||
|
||||
[transmission]
|
||||
dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"]
|
||||
|
||||
@ -30,6 +30,7 @@ in
|
||||
breadline = addToBuildInputs pkgs.readline;
|
||||
blas = addToBuildInputsWithPkgConfig pkgs.blas;
|
||||
blosc = addToBuildInputs pkgs.c-blosc;
|
||||
botan = addToBuildInputsWithPkgConfig pkgs.botan2;
|
||||
cairo = old:
|
||||
(addToBuildInputsWithPkgConfig pkgs.cairo old)
|
||||
// (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old);
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.15.5";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exaloop";
|
||||
repo = "codon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/IUGX5iSRvZzwyRdkGe0IVHp44D+GXZtbkdtswekwSU=";
|
||||
hash = "sha256-s2GqiFcekXRts8BU5CSmTrkFZ9xLqq4A5MybhB1o1Gg=";
|
||||
};
|
||||
|
||||
depsDir = "deps";
|
||||
@ -31,7 +31,7 @@ let
|
||||
owner = "exaloop";
|
||||
repo = "llvm-project";
|
||||
rev = "55b0b8fa1c9f9082b535628fc9fa6313280c0b9a";
|
||||
sha256 = "sha256-03SPQgNdrpR6/JZ5aR/ntoh/FnZvCjT/6bTAcZaFafw=";
|
||||
hash = "sha256-03SPQgNdrpR6/JZ5aR/ntoh/FnZvCjT/6bTAcZaFafw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -43,8 +43,6 @@ let
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_COMPILER=clang++"
|
||||
"-DCMAKE_C_COMPILER=clang"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DLLVM_ENABLE_TERMINFO=OFF"
|
||||
"-DLLVM_ENABLE_ZLIB=OFF"
|
||||
@ -88,7 +86,12 @@ let
|
||||
_deps/googletest-subbuild/googletest-populate-prefix/src/*.zip
|
||||
'';
|
||||
|
||||
outputHash = "sha256-a1zGSpbMjfQBrcgW/aiIdKX8+uI3p/S9pgZjHe2HtWs=";
|
||||
outputHash =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
"sha256-KfemYV42xBAhsPbwTkzdc3GxCVHiWRbyUZORPWxx4vg="
|
||||
else
|
||||
"sha256-a1zGSpbMjfQBrcgW/aiIdKX8+uI3p/S9pgZjHe2HtWs=";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
};
|
||||
in
|
||||
@ -117,14 +120,15 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DCMAKE_CXX_COMPILER=clang++"
|
||||
"-DCMAKE_C_COMPILER=clang"
|
||||
"-DCPM_SOURCE_CACHE=${depsDir}"
|
||||
"-DLLVM_DIR=${codon-llvm}/lib/cmake/llvm"
|
||||
"-DLLVM_USE_LINKER=lld"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
ln -s $out/lib/codon/*.dylib $out/lib/
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@ -4,9 +4,12 @@
|
||||
, cmake
|
||||
, darwin # Accelerate
|
||||
, llvmPackages # openmp
|
||||
, oneDNN
|
||||
, openblas
|
||||
, withMkl ? false, mkl
|
||||
# Enabling both withOneDNN and withOpenblas is broken
|
||||
# https://github.com/OpenNMT/CTranslate2/issues/1294
|
||||
, withOneDNN ? false, oneDNN
|
||||
, withOpenblas ? true, openblas
|
||||
, withRuy ? true
|
||||
}:
|
||||
|
||||
let
|
||||
@ -30,19 +33,24 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
# https://opennmt.net/CTranslate2/installation.html#build-options
|
||||
"-DWITH_DNNL=OFF" # requires oneDNN>=3.0
|
||||
"-DWITH_OPENBLAS=ON"
|
||||
# https://github.com/OpenNMT/CTranslate2/blob/54810350e662ebdb01ecbf8e4a746f02aeff1dd7/python/tools/prepare_build_environment_linux.sh#L53
|
||||
# https://github.com/OpenNMT/CTranslate2/blob/59d223abcc7e636c1c2956e62482bc3299cc7766/python/tools/prepare_build_environment_macos.sh#L12
|
||||
"-DOPENMP_RUNTIME=COMP"
|
||||
"-DWITH_DNNL=${cmakeBool withOneDNN}"
|
||||
"-DWITH_OPENBLAS=${cmakeBool withOpenblas}"
|
||||
"-DWITH_RUY=${cmakeBool withRuy}"
|
||||
"-DWITH_MKL=${cmakeBool withMkl}"
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin "-DWITH_ACCELERATE=ON";
|
||||
|
||||
buildInputs = [
|
||||
llvmPackages.openmp
|
||||
openblas
|
||||
oneDNN
|
||||
] ++ lib.optional withMkl [
|
||||
buildInputs = lib.optionals withMkl [
|
||||
mkl
|
||||
] ++ lib.optionals withOneDNN [
|
||||
oneDNN
|
||||
] ++ lib.optionals withOpenblas [
|
||||
openblas
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
llvmPackages.openmp
|
||||
darwin.apple_sdk.frameworks.Accelerate
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
darwin.apple_sdk.frameworks.CoreGraphics
|
||||
@ -54,6 +62,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/OpenNMT/CTranslate2";
|
||||
changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
maintainers = with maintainers; [ hexa misuzu ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
let
|
||||
rev = "63acb96f92473ceb5e21d873d7c0aee266b3d6d3";
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
, nlohmann_json
|
||||
, msgpack
|
||||
, sqlite
|
||||
, oneDNN
|
||||
, oneDNN_2
|
||||
, blaze
|
||||
, texlive
|
||||
, doxygen
|
||||
@ -91,7 +91,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
nlohmann_json
|
||||
msgpack
|
||||
sqlite
|
||||
oneDNN
|
||||
oneDNN_2
|
||||
blaze
|
||||
python3Packages.pybind11
|
||||
python3Packages.onnx
|
||||
|
||||
41
pkgs/development/libraries/oneDNN/2.nix
Normal file
41
pkgs/development/libraries/oneDNN/2.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake }:
|
||||
|
||||
# This was originally called mkl-dnn, then it was renamed to dnnl, and it has
|
||||
# just recently been renamed again to oneDNN. See here for details:
|
||||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oneDNN";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# Tests fail on some Hydra builders, because they do not support SSE4.2.
|
||||
doCheck = false;
|
||||
|
||||
# Fixup bad cmake paths
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/cmake/dnnl/dnnl-config.cmake \
|
||||
--replace "\''${PACKAGE_PREFIX_DIR}/" ""
|
||||
|
||||
substituteInPlace $out/lib/cmake/dnnl/dnnl-targets.cmake \
|
||||
--replace "\''${_IMPORT_PREFIX}/" ""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "oneAPI Deep Neural Network Library (oneDNN)";
|
||||
homepage = "https://01.org/oneDNN";
|
||||
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ alexarice bhipple ];
|
||||
};
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oneDNN";
|
||||
version = "2.7.1";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c=";
|
||||
sha256 = "sha256-02S9eG9eAUS7S59YtyaAany07A2V/Cu7Vto2IruDCtc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
, howard-hinnant-date
|
||||
, nlohmann_json
|
||||
, boost
|
||||
, oneDNN
|
||||
, oneDNN_2
|
||||
, abseil-cpp_202111
|
||||
, gtest
|
||||
, pythonSupport ? false
|
||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
howard-hinnant-date
|
||||
nlohmann_json
|
||||
boost
|
||||
oneDNN
|
||||
oneDNN_2
|
||||
protobuf
|
||||
] ++ lib.optionals pythonSupport [
|
||||
nsync
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-data-tables";
|
||||
version = "12.4.2";
|
||||
version = "12.4.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-Oz1dFbKpY+CbSTSx/iuiF/Kd2axRghwXVJ/K+HRwJDQ=";
|
||||
hash = "sha256-qLA0vNRyIu36xKwB55BD/TCTOv+nmyOtk3+Y4P+SalI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-dns";
|
||||
version = "8.0.0";
|
||||
version = "8.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8";
|
||||
sha256 = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-servicebus";
|
||||
version = "7.10.0";
|
||||
version = "7.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-ANEJ5aLqfHX/OGO41FNjCqr9S6UygQMrGMQvMtR3z/Q=";
|
||||
hash = "sha256-JMmfs1d1EFilHJ1Dud4mGJynRHLx+Uq95nZM2D+NecE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -98,7 +98,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Scalable Python framework for cluster administration";
|
||||
homepage = "https://cea-hpc.github.io/clustershell";
|
||||
license = licenses.lgpl21;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-jwt-extended";
|
||||
version = "4.4.4";
|
||||
version = "4.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Flask-JWT-Extended";
|
||||
inherit version;
|
||||
hash = "sha256-YrUh11SUwpCmRq6KzHcSNyHkNkeQ8eZK8AONgjlh+/A=";
|
||||
hash = "sha256-ulYkW6Q7cciuk2eEuGdiXc6LmVb67t7ClTIi5XlC+ws=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -44,6 +44,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/vimalloc/flask-jwt-extended/releases/tag/${version}";
|
||||
description = "JWT extension for Flask";
|
||||
homepage = "https://flask-jwt-extended.readthedocs.io/";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet-core";
|
||||
version = "0.6.2";
|
||||
version = "0.7.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "flet_core";
|
||||
inherit version;
|
||||
hash = "sha256-WMkm+47xhuYz1HsiPfF7YbOCg7Xlbj9oHI9nVtwAb/w=";
|
||||
hash = "sha256-8WG7odYiGrew4GwD+MUuzQPmDn7V/GmocBproqsbCNw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -6,17 +6,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet";
|
||||
version = "0.6.2";
|
||||
version = "0.7.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EDNATwO2N4jXVC5H1VmXqC9XGTnQo8vLvTEozRYZuj4=";
|
||||
hash = "sha256-vFPjN+5wIygtP035odAOSdF9PQe6eXz6CJ9Q0d8ScFo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./pyproject.toml.patch
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'httpx = "^0.23' 'httpx = ">=0.23' \
|
||||
--replace 'watchdog = "^2' 'watchdog = ">=2'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -20,7 +20,7 @@ flet-core = "0.6.2"
|
||||
python = "^3.7"
|
||||
typing-extensions = { version = "^4.4.0", python = "<3.8" }
|
||||
websocket-client = "^1.4.2"
|
||||
-watchdog = "^2.2.1"
|
||||
+watchdog = ">=2.2.1"
|
||||
oauthlib = "^3.2.2"
|
||||
websockets = "^10.4"
|
||||
httpx = "^0.23.3"
|
||||
@ -66,6 +66,7 @@
|
||||
, pytest-mock
|
||||
, pytest-socket
|
||||
, pandas
|
||||
, syrupy
|
||||
, toml
|
||||
, freezegun
|
||||
, responses
|
||||
@ -76,7 +77,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "0.0.195";
|
||||
version = "0.0.201";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -85,7 +86,7 @@ buildPythonPackage rec {
|
||||
owner = "hwchase17";
|
||||
repo = "langchain";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PUBFAAqCAshUkASsGnFNQ5+Xh6416ISkMqJ0bYcx7WI=";
|
||||
hash = "sha256-+mS6rKypDrlKFg+c0GPAZ0YX7UYN+mlilnbX2hptLt0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -233,6 +234,7 @@ buildPythonPackage rec {
|
||||
pytest-socket
|
||||
pytest-asyncio
|
||||
pandas
|
||||
syrupy
|
||||
toml
|
||||
freezegun
|
||||
responses
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchainplus-sdk";
|
||||
version = "0.0.6";
|
||||
version = "0.0.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "langchainplus_sdk";
|
||||
hash = "sha256-yRGpj9LQK6pI90K31wD9alXxHJpUXuXWawiCWUDJoy4=";
|
||||
hash = "sha256-T4ELON90qZ0B5XI+ZT2gLwXfPukilxzMq8Nl0Awz2/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nitransforms";
|
||||
version = "22.0.0";
|
||||
version = "23.0.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c=";
|
||||
hash = "sha256-Jzb0W3HHxkNPyPcAT2G9T8zLOfq7xQTwGA6IUO5a6KA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
@ -56,6 +56,8 @@ buildPythonPackage rec {
|
||||
"poetry_dynamic_versioning"
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for Poetry to enable dynamic versioning based on VCS tags";
|
||||
homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning";
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
version-pretend-hook() {
|
||||
echo "Setting POETRY_DYNAMIC_VERSIONING_BYPASS to $version"
|
||||
export POETRY_DYNAMIC_VERSIONING_BYPASS=$version
|
||||
}
|
||||
|
||||
if [ -z "${dontBypassPoetryDynamicVersioning-}" ]; then
|
||||
preBuildHooks+=(version-pretend-hook)
|
||||
fi
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinsteon";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5c2hcW9XSEyIMlyrn70U7tgBWdxGrtJoQkjkYzlrbKE=";
|
||||
hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyjwt";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "PyJWT";
|
||||
inherit version;
|
||||
hash = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0=";
|
||||
hash = "sha256-vWyko8QoXBotQ0nloDX9+PuU4EzND8vmuiidrpzD4HQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -48,6 +48,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "jwt" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/jpadilla/pyjwt/blob/${version}/CHANGELOG.rst";
|
||||
description = "JSON Web Token implementation in Python";
|
||||
homepage = "https://github.com/jpadilla/pyjwt";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, poetry-dynamic-versioning
|
||||
, pyjwt
|
||||
, pytest-aiohttp
|
||||
, pytest-freezegun
|
||||
@ -14,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylitterbot";
|
||||
version = "2023.4.0";
|
||||
version = "2023.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,12 +23,13 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "natekspencer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nF6njY2qNoHW2ZGNDHNeTBTjSBbitJxitPgyayLaqSE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zB/LJGEPJ3uZEoVQiLQUCWqLo9YLXN6vge3RhIwA5D4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -50,7 +52,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Modulefor controlling a Litter-Robot";
|
||||
homepage = "https://github.com/natekspencer/pylitterbot";
|
||||
changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${version}";
|
||||
changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -23,6 +23,8 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "weconnect[Images]~=" "weconnect>="
|
||||
substituteInPlace weconnect_mqtt/__version.py \
|
||||
--replace "develop" "${version}"
|
||||
substituteInPlace pytest.ini \
|
||||
|
||||
@ -47,6 +47,8 @@ buildPythonPackage rec {
|
||||
substituteInPlace setup.py \
|
||||
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
|
||||
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "requests~=2.29.0" "requests"
|
||||
substituteInPlace image_extra_requirements.txt \
|
||||
--replace "pillow~=" "pillow>=" \
|
||||
--replace "ascii_magic~=" "ascii_magic>="
|
||||
|
||||
41
pkgs/development/tools/analysis/banana-vera/default.nix
Normal file
41
pkgs/development/tools/analysis/banana-vera/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python310
|
||||
, tcl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "banana-vera";
|
||||
version = "1.3.0-python3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Epitech";
|
||||
repo = "banana-vera";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-1nAKhUltQS1301JNrr0PQQrrf2W9Hj5gk1nbUhN4cXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
python310
|
||||
python310.pkgs.boost
|
||||
tcl
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERA_LUA=OFF"
|
||||
"-DVERA_USE_SYSTEM_BOOST=ON"
|
||||
"-DPANDOC=OFF"
|
||||
];
|
||||
|
||||
meta = {
|
||||
mainProgram = "vera++";
|
||||
description = "A fork of vera using python3.10";
|
||||
homepage = "https://github.com/Epitech/banana-vera";
|
||||
license = lib.licenses.boost;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.207.0";
|
||||
version = "0.208.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0qEo1drdtIxdZriaLNm+T1J00wJoeBbtox5LDmrLX4Y=";
|
||||
sha256 = "sha256-fZWSTSq8C4LwOuZaR4HtxJ5jwVKqmcIzf2zTyHeK1Cs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.31.1";
|
||||
version = "0.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TTGC2lvqG+RYsruNzo7GApT5HMJyG4aoT12Rju9hTmY=";
|
||||
hash = "sha256-t7LFAWdqbJLOmrac6IXgo+9TK53B7FWLFo1YAY4sPqs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DPJ6+akisNtMsbDdHWEWavZ2GJfeWjFIV6K+bV91FEY=";
|
||||
vendorHash = "sha256-AbHjwHwgFwDOwgbuQI3D+zNY71ikA5CPlJUFQIDjhm0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.2";
|
||||
version = "0.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uzEnHe6M5xQV2jj+10KeTOCY5dP/78P08h4hgn2yUDc=";
|
||||
hash = "sha256-rWziaR3c4rRcXp2CLNWWC4Kc2woCXP/nrMOCsp/nc9Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@ -188,6 +188,7 @@ in buildFHSEnv rec {
|
||||
libvorbis # Dead Cells
|
||||
libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2
|
||||
mono
|
||||
ncurses # Crusader Kings III
|
||||
xorg.xkeyboardconfig
|
||||
xorg.libpciaccess
|
||||
xorg.libXScrnSaver # Dead Cells
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.1.0";
|
||||
version = "10.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gMSKk5igNy8W7Qb1xtKgfpzftiPVZaAv/oKIdinTMGA=";
|
||||
hash = "sha256-ZyclYBUQ7X1X9NOPEk1HIoCNYw6zybhno9vq/yqmER8=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-WF66oSkH46mA+WLazJ/qgfNSTXBbeWhbeBYIcP2Q3aQ=";
|
||||
vendorHash = "sha256-J6I2ZSelebf4dUYn+xrBOg63+jjzapNkDLUFmqBSg2E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -6,18 +6,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "raycast";
|
||||
version = "1.53.2";
|
||||
version = "1.53.3";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/NixOS/nixpkgs/pull/223495
|
||||
# official download API: https://api.raycast.app/v2/download
|
||||
# this returns an AWS CloudFront signed URL with expiration timestamp and signature
|
||||
# the returned URL will always be the latest Raycast which might result in an impure derivation
|
||||
# the package maintainer created a repo (https://github.com/stepbrobd/raycast-overlay)
|
||||
# to host GitHub Actions to periodically check for updates
|
||||
# and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
|
||||
url = "https://archive.org/download/raycast/raycast-${version}.dmg";
|
||||
sha256 = "sha256-e2UGS1LSBj0xZu0gWlb8SiXhx1sZzcZDOGPhg6ziI9c=";
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${version}/download?build=universal";
|
||||
sha256 = "sha256-FHCNySTtP7Dxa2UAlYoHD4u5ammLuhOQKC3NGpxcyYo=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
new_version="$(ia list raycast | grep -Eo '^raycast-.*\.dmg$' | sort -r | head -n1 | sed -E 's/^raycast-([0-9]+\.[0-9]+\.[0-9]+)\.dmg$/\1/')"
|
||||
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
||||
new_version=$(curl --silent https://releases.raycast.com/releases/latest | jq -r '.version')
|
||||
old_version=$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)
|
||||
|
||||
if [[ "$new_version" == "$old_version" ]]; then
|
||||
if [[ $new_version == $old_version ]]; then
|
||||
echo "Already up to date."
|
||||
exit 0
|
||||
else
|
||||
@ -15,6 +15,6 @@ else
|
||||
rm ./default.nix.bak
|
||||
fi
|
||||
|
||||
hash="$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://archive.org/download/raycast/raycast-$new_version.dmg" | jq -r '.hash')"
|
||||
hash=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://releases.raycast.com/releases/$new_version/download?build=universal" | jq -r '.hash')
|
||||
sed -Ei.bak '/ *sha256 = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' ./default.nix
|
||||
rm ./default.nix.bak
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.6.1";
|
||||
version = "2023.6.2";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
@ -2010,9 +2010,8 @@
|
||||
"keyboard" = ps: with ps; [
|
||||
]; # missing inputs: pyuserinput
|
||||
"keyboard_remote" = ps: with ps; [
|
||||
aionotify
|
||||
evdev
|
||||
];
|
||||
]; # missing inputs: asyncinotify
|
||||
"keymitt_ble" = ps: with ps; [
|
||||
pymicrobot
|
||||
aioesphomeapi
|
||||
@ -2863,7 +2862,8 @@
|
||||
opensensemap-api
|
||||
];
|
||||
"opensky" = ps: with ps; [
|
||||
]; # missing inputs: python-opensky
|
||||
python-opensky
|
||||
];
|
||||
"opentherm_gw" = ps: with ps; [
|
||||
pyotgw
|
||||
];
|
||||
@ -2877,8 +2877,7 @@
|
||||
pyopnsense
|
||||
];
|
||||
"opple" = ps: with ps; [
|
||||
pyoppleio
|
||||
];
|
||||
]; # missing inputs: pyoppleio-legacy
|
||||
"oralb" = ps: with ps; [
|
||||
aioesphomeapi
|
||||
aiohttp-cors
|
||||
@ -3352,7 +3351,7 @@
|
||||
pyruckus
|
||||
];
|
||||
"russound_rio" = ps: with ps; [
|
||||
]; # missing inputs: russound_rio
|
||||
]; # missing inputs: russound-rio
|
||||
"russound_rnet" = ps: with ps; [
|
||||
]; # missing inputs: russound
|
||||
"ruuvi_gateway" = ps: with ps; [
|
||||
|
||||
@ -296,7 +296,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.6.1";
|
||||
hassVersion = "2023.6.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -312,7 +312,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8F2KiV/lujTbaWQl0IfCwzQ7HxNioHAHcffi7lL2hzs=";
|
||||
hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
@ -320,7 +320,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ojiNHl+sm1mLiM+rjESeR2zPOCGkG3RQ9to6VfetmZQ=";
|
||||
hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.6.1";
|
||||
version = "2023.6.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LiBn9NpR7sAAZX1yPT0V5LhQeALPvGVRzDam7cCBoi8=";
|
||||
hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,9 +20,9 @@
|
||||
]
|
||||
},
|
||||
"contacts": {
|
||||
"sha256": "1xs42qfnw9j5f930798yl9vj2dpmjsg3i1m6phx0x3dbcbjd2da6",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.0/contacts-v5.3.0.tar.gz",
|
||||
"version": "5.3.0",
|
||||
"sha256": "07bnq5hfw9br2xa1j77vydwdaxnc0jyzpacd9hh4f5hvgxmbg6ag",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/V5.3.1/contacts-V5.3.1.tar.gz",
|
||||
"version": "5.3.1",
|
||||
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
|
||||
"homepage": "https://github.com/nextcloud/contacts#readme",
|
||||
"licenses": [
|
||||
@ -169,6 +169,16 @@
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"qownnotesapi": {
|
||||
"sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k",
|
||||
"url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz",
|
||||
"version": "23.6.0",
|
||||
"description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!",
|
||||
"homepage": "https://github.com/pbek/qownnotesapi",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"registration": {
|
||||
"sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9",
|
||||
"url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz",
|
||||
|
||||
@ -20,9 +20,9 @@
|
||||
]
|
||||
},
|
||||
"contacts": {
|
||||
"sha256": "1xs42qfnw9j5f930798yl9vj2dpmjsg3i1m6phx0x3dbcbjd2da6",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.0/contacts-v5.3.0.tar.gz",
|
||||
"version": "5.3.0",
|
||||
"sha256": "07bnq5hfw9br2xa1j77vydwdaxnc0jyzpacd9hh4f5hvgxmbg6ag",
|
||||
"url": "https://github.com/nextcloud-releases/contacts/releases/download/V5.3.1/contacts-V5.3.1.tar.gz",
|
||||
"version": "5.3.1",
|
||||
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
|
||||
"homepage": "https://github.com/nextcloud/contacts#readme",
|
||||
"licenses": [
|
||||
@ -100,9 +100,9 @@
|
||||
]
|
||||
},
|
||||
"mail": {
|
||||
"sha256": "03az3x6mjswh4zj1a5zi9v7syskxkv98agvvv1pkmr76zbbvrzi0",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.0/mail-v3.2.0.tar.gz",
|
||||
"version": "3.2.0",
|
||||
"sha256": "1i149w2c2nlk3yn0bh872ijkaqxqbnlvsr558fn8gml0z9vwdfav",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.1/mail-v3.2.1.tar.gz",
|
||||
"version": "3.2.1",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
|
||||
"homepage": "https://github.com/nextcloud/mail#readme",
|
||||
"licenses": [
|
||||
@ -169,6 +169,16 @@
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"qownnotesapi": {
|
||||
"sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k",
|
||||
"url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz",
|
||||
"version": "23.6.0",
|
||||
"description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!",
|
||||
"homepage": "https://github.com/pbek/qownnotesapi",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"registration": {
|
||||
"sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9",
|
||||
"url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz",
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
, "onlyoffice"
|
||||
, "polls"
|
||||
, "previewgenerator"
|
||||
, "qownnotesapi"
|
||||
, "registration"
|
||||
, "spreed"
|
||||
, "tasks"
|
||||
|
||||
37
pkgs/servers/nosql/questdb/default.nix
Normal file
37
pkgs/servers/nosql/questdb/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ fetchurl, jdk17_headless, lib, makeWrapper, stdenv }:
|
||||
|
||||
let
|
||||
jre = jdk17_headless;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "questdb";
|
||||
version = "7.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/questdb/questdb/releases/download/${version}/questdb-${version}-no-jre-bin.tar.gz";
|
||||
sha256 = "lB3h8HRQaQwdTtxxjHNfYrDXY3UULSSrM74OCGgLoMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/java
|
||||
cp questdb.sh $out/bin
|
||||
cp questdb.jar $out/share/java
|
||||
|
||||
ln -s $out/share/java/questdb.jar $out/bin
|
||||
wrapProgram $out/bin/questdb.sh --set JAVA_HOME "${jre}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "high-performance, open-source SQL database for applications in financial services, IoT, machine learning, DevOps and observability";
|
||||
homepage = "https://questdb.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.jacfal ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -58,13 +58,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openvscode-server";
|
||||
version = "1.79.0";
|
||||
version = "1.79.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitpod-io";
|
||||
repo = "openvscode-server";
|
||||
rev = "openvscode-server-v${finalAttrs.version}";
|
||||
hash = "sha256-dVzGyK1ybZywCm602zWJroSCQ2wx5IzV+HqwZUsEgKU=";
|
||||
hash = "sha256-yMJo66RYcbVyIFKNNxDe0U9CPvaez/kTu9sPGcaESPw=";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
|
||||
++ (with xorg; [ libX11 libxkbfile ])
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
|
||||
@ -23,8 +23,8 @@ in
|
||||
};
|
||||
|
||||
netbox = callPackage generic {
|
||||
version = "3.5.0";
|
||||
hash = "sha256-LsUitX/e+ec/9mRBw+cbGOG2Idl9ZQwf/vxIC3YS5LU=";
|
||||
version = "3.5.3";
|
||||
hash = "sha256-F8rsTOOxARI3ll545AF0+HFaG4wNO+RWwsl5y9kAyE4=";
|
||||
extraPatches = [
|
||||
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
|
||||
./config.patch
|
||||
|
||||
@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl gettext ];
|
||||
strictdeps = true;
|
||||
nativeBuildInputs = [ makeWrapper gettext ];
|
||||
buildInputs = [ perl ]; # perl is needed for `lib/byobu/include/*` scripts
|
||||
propagatedBuildInputs = [ textual-window-manager screen ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,21 +1,33 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${date}";
|
||||
pname = "pwnat";
|
||||
date = "2014-09-08";
|
||||
# Latest release has an annoying segmentation fault bug, see:
|
||||
# https://github.com/samyk/pwnat/pull/25 . Merging only #25 is impossible due
|
||||
# to major code refactoring.
|
||||
version = "2023-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samyk";
|
||||
repo = pname;
|
||||
rev = "1d07c2eb53171733831c0cd01e4e96a3204ec446";
|
||||
sha256 = "056xhlnf1axa6k90i018xwijkwc9zc7fms35hrkzwgs40g9ybrx5";
|
||||
rev = "8ec62cdae53a2d573c9f9c906133ca45bbd3360a";
|
||||
sha256 = "sha256-QodNw3ab8/TurKamg6AgMfQ08aalp4j6q663B+sWmRM=";
|
||||
};
|
||||
|
||||
# See https://github.com/samyk/pwnat/issues/28
|
||||
preBuild = ''
|
||||
mkdir obj
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/pwnat
|
||||
cp pwnat $out/bin
|
||||
cp README* COPYING* $out/share/pwnat
|
||||
runHook preInstall
|
||||
|
||||
install -D pwnat $out/bin/pwnat
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "extra-container";
|
||||
version = "0.11";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erikarvstedt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ORe1tSWhmgIaDj3CTEovsFCq+60LQmYy8RUx9v7De30=";
|
||||
hash = "sha256-/5wPv962ZHvZoZMOr4nMz7qcvbzlExRYS2nrnay/PU8=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Run declarative containers without full system rebuilds";
|
||||
homepage = "https://github.com/erikarvstedt/extra-container";
|
||||
changelog = "https://github.com/erikarvstedt/extra-container/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.erikarvstedt ];
|
||||
|
||||
@ -435,6 +435,8 @@ with pkgs;
|
||||
|
||||
checkpwn = callPackage ../tools/misc/checkpwn { };
|
||||
|
||||
banana-vera = callPackage ../development/tools/analysis/banana-vera { };
|
||||
|
||||
chrysalis = callPackage ../applications/misc/chrysalis { };
|
||||
|
||||
ciel = callPackage ../tools/package-management/ciel { };
|
||||
@ -11530,9 +11532,7 @@ with pkgs;
|
||||
|
||||
postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
|
||||
|
||||
povray = callPackage ../tools/graphics/povray {
|
||||
boost = boost175;
|
||||
};
|
||||
povray = callPackage ../tools/graphics/povray { };
|
||||
|
||||
power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { };
|
||||
|
||||
@ -17082,7 +17082,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
inherit (beam.interpreters)
|
||||
erlang erlang_25 erlang_24 erlang_23
|
||||
erlang erlang_26 erlang_25 erlang_24 erlang_23
|
||||
erlang_odbc erlang_javac erlang_odbc_javac
|
||||
elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
|
||||
elixir-ls;
|
||||
@ -23456,6 +23456,8 @@ with pkgs;
|
||||
|
||||
oneDNN = callPackage ../development/libraries/oneDNN { };
|
||||
|
||||
oneDNN_2 = callPackage ../development/libraries/oneDNN/2.nix { };
|
||||
|
||||
onedrive = callPackage ../applications/networking/sync/onedrive { };
|
||||
|
||||
oneko = callPackage ../applications/misc/oneko { };
|
||||
@ -24456,6 +24458,8 @@ with pkgs;
|
||||
|
||||
taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
|
||||
|
||||
tanidvr = callPackage ../applications/video/tanidvr { };
|
||||
|
||||
talloc = callPackage ../development/libraries/talloc { };
|
||||
|
||||
tagparser = callPackage ../development/libraries/tagparser { };
|
||||
@ -26361,6 +26365,8 @@ with pkgs;
|
||||
|
||||
qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
|
||||
|
||||
questdb = callPackage ../servers/nosql/questdb { };
|
||||
|
||||
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
|
||||
elixir = elixir_1_14;
|
||||
@ -35866,6 +35872,8 @@ with pkgs;
|
||||
|
||||
yuview = libsForQt5.yuview;
|
||||
|
||||
wallust = callPackage ../applications/misc/wallust { };
|
||||
|
||||
zam-plugins = callPackage ../applications/audio/zam-plugins { };
|
||||
|
||||
zammad = callPackage ../applications/networking/misc/zammad { };
|
||||
@ -36190,9 +36198,7 @@ with pkgs;
|
||||
|
||||
wasabibackend = callPackage ../applications/blockchains/wasabibackend { };
|
||||
|
||||
wownero = callPackage ../applications/blockchains/wownero {
|
||||
boost = boost175;
|
||||
};
|
||||
wownero = callPackage ../applications/blockchains/wownero { };
|
||||
|
||||
zcash = callPackage ../applications/blockchains/zcash {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@ -37891,6 +37897,8 @@ with pkgs;
|
||||
neuron-version = neuron.version;
|
||||
};
|
||||
|
||||
kalign = callPackage ../applications/science/biology/kalign { };
|
||||
|
||||
kallisto = callPackage ../applications/science/biology/kallisto {
|
||||
autoconf = buildPackages.autoconf269;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user